diff options
| -rw-r--r-- | jjb-sandbox/releng/releng-sandbox-jobs.yml | 61 | ||||
| -rwxr-xr-x | jjb-sandbox/releng/verify-sandbox-jobs.sh | 21 | ||||
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 1 | ||||
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yaml | 3 | ||||
| -rw-r--r-- | jjb/auto/auto.yaml | 9 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 8 | ||||
| -rw-r--r-- | jjb/releng/compass4nfv-docker.yaml | 1 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yaml | 30 | ||||
| -rw-r--r-- | jjb/releng/opnfv-repo-archiver.sh | 2 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yaml | 2 |
11 files changed, 46 insertions, 94 deletions
diff --git a/jjb-sandbox/releng/releng-sandbox-jobs.yml b/jjb-sandbox/releng/releng-sandbox-jobs.yml deleted file mode 100644 index df8b1d56a..000000000 --- a/jjb-sandbox/releng/releng-sandbox-jobs.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -- project: - name: 'releng-sandbox-jobs' - jobs: - - 'releng-deploy-sandbox' - - project: 'releng' - node: 'releng-sandbox' - -- job-template: - name: 'releng-deploy-sandbox' - node: '{node}' - - parameters: - - project-parameter: - project: '{project}' - branch: 'master' - scm: - - git-scm-gerrit - - triggers: - - gerrit: - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'redeploy' - custom-url: '$BUILD_URL deploying to $JENKINS_URL' - silent-start: true - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - file-paths: - - compare-type: ANT - pattern: jjb-sandbox/** - - wrappers: '' - - builders: - - shell: - !include-raw-escape: verify-sandbox-jobs.sh - # yamllint disable rule:line-length - - shell: | - #!/bin/bash - jenkins-jobs update --delete-old -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox - # yamllint enable - publishers: - - archive-artifacts: - artifacts: 'job_output/*' - - email-jenkins-admins-on-failure diff --git a/jjb-sandbox/releng/verify-sandbox-jobs.sh b/jjb-sandbox/releng/verify-sandbox-jobs.sh deleted file mode 100755 index 599016106..000000000 --- a/jjb-sandbox/releng/verify-sandbox-jobs.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2016 Linux Foundation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -#test for non-ascii characters, these can pass the test and end up breaking things in production -for x in $(find . -name *\.yml); do - - if LC_ALL=C grep -q '[^[:print:][:space:]]' "$x"; then - echo "file "$x" contains non-ascii characters" - exit 1 - fi - -done - -jenkins-jobs test -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox \ - -o job_output diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index fd6be6e81..2f29765d2 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -359,6 +359,7 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true kill-phase-on: NEVER + enable-condition: "def m = '$DEPLOY_SCENARIO' != k8s-nosdn-nofeature-noha" abort-all-job: true git-revision: false - multijob: diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml index fe2bbcc63..140f84b03 100644 --- a/jjb/armband/armband-ci-jobs.yaml +++ b/jjb/armband/armband-ci-jobs.yaml @@ -252,6 +252,9 @@ - string: name: DEPLOY_SCENARIO default: 'os-odl-nofeature-ha' + - string: + name: PROJECT + default: '{project}' scm: - git-scm diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index 5c2af043c..0cfe88f93 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -96,17 +96,14 @@ - string: name: DEPLOY_SCENARIO default: '{scenario}' - - string: - name: PROJECT - default: '{project}' builders: - trigger-builds: - project: '{installer}-deploy-{pod}-daily-{stream}' current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO='os-nosdn-nofeature-ha' - PROJECT='armband' + predefined-parameters: | + DEPLOY_SCENARIO=os-nosdn-nofeature-ha + PROJECT=armband same-node: true block: true diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index df681dd59..fe827808d 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -169,10 +169,14 @@ fi if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then sudo chmod 666 ${DOVETAIL_CONFIG}/pod.yaml echo "Adapt process info for $INSTALLER_TYPE ..." - attack_process='rabbitmq' + if [ "$INSTALLER_TYPE" == "apex" ]; then + attack_process='rabbitmq_server' + else + attach_process='rabbitmq' + fi cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml process_info: -- {testcase_name: dovetail.ha.tc010, attack_process: ${attack_process}} +- {testcase_name: dovetail.ha.rabbitmq, attack_process: ${attack_process}} EOF echo "file ${DOVETAIL_CONFIG}/pod.yaml:" diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml index 7bfda552d..2a5453658 100644 --- a/jjb/releng/compass4nfv-docker.yaml +++ b/jjb/releng/compass4nfv-docker.yaml @@ -43,7 +43,6 @@ PUSH_IMAGE=$PUSH_IMAGE COMMIT_ID=$COMMIT_ID GERRIT_REFNAME=$GERRIT_REFNAME - DOCKERFILE=$DOCKERFILE kill-phase-on: FAILURE abort-all-jobs: false diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index b7d1ce66f..c73bae371 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -165,6 +165,36 @@ <<: *master <<: *other-receivers # projects with jobs for euphrates + - 'barometer-collectd': + project: 'barometer' + dockerdir: 'docker/barometer-collectd' + <<: *fraser + <<: *other-receivers + - 'barometer-grafana': + project: 'barometer' + dockerdir: 'docker/barometer-grafana' + <<: *fraser + <<: *other-receivers + - 'barometer-influxdb': + project: 'barometer' + dockerdir: 'docker/barometer-influxdb' + <<: *fraser + <<: *other-receivers + - 'barometer-kafka': + project: 'barometer' + dockerdir: 'docker/barometer-kafka' + <<: *fraser + <<: *other-receivers + - 'barometer-ves': + project: 'barometer' + dockerdir: 'docker/barometer-ves' + <<: *fraser + <<: *other-receivers + - 'barometer-snmp': + project: 'barometer' + dockerdir: 'docker/barometer-snmp' + <<: *fraser + <<: *other-receivers - 'bottlenecks': project: 'bottlenecks' <<: *euphrates diff --git a/jjb/releng/opnfv-repo-archiver.sh b/jjb/releng/opnfv-repo-archiver.sh index 6fa0aef50..b7ff3baa0 100644 --- a/jjb/releng/opnfv-repo-archiver.sh +++ b/jjb/releng/opnfv-repo-archiver.sh @@ -29,7 +29,7 @@ for PROJECT in "${PROJECT_LIST[@]}"; do git clone "https://gerrit.opnfv.org/gerrit/$PROJECT.git" $CLONE_PATH/$PROJECT else pushd "$CLONE_PATH/$PROJECT" &>/dev/null - git pull -f + git pull -f origin master popd &> /dev/null fi diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml index 2230cd56d..baff0c99e 100644 --- a/jjb/xci/xci-verify-jobs.yaml +++ b/jjb/xci/xci-verify-jobs.yaml @@ -20,7 +20,7 @@ unstable: false notbuilt: false - centos: - disabled: false + disabled: true successful: true failed: true unstable: true diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index 4df3f520d..c5a35086f 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -288,7 +288,7 @@ publishers: - email: - recipients: jean.gaoliang@huawei.com limingjiang@huawei.com ross.b.brattain@intel.com + recipients: jean.gaoliang@huawei.com limingjiang@huawei.com - email-jenkins-admins-on-failure ######################## |