diff options
Diffstat (limited to 'jjb')
-rwxr-xr-x | jjb/apex/apex-unit-test.sh | 2 | ||||
-rw-r--r-- | jjb/apex/apex.yml | 42 | ||||
-rw-r--r-- | jjb/apex/apex.yml.j2 | 12 | ||||
-rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 9 | ||||
-rw-r--r-- | jjb/ci_gate_security/opnfv-ci-gate-security.yml | 6 | ||||
-rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 4 | ||||
-rw-r--r-- | jjb/compass4nfv/compass-verify-jobs.yml | 6 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 35 | ||||
-rw-r--r-- | jjb/doctor/doctor.yml | 4 | ||||
-rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 10 | ||||
-rw-r--r-- | jjb/functest/functest-project-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/global/releng-macros.yml | 46 | ||||
-rw-r--r-- | jjb/global/slave-params.yml | 11 | ||||
-rw-r--r-- | jjb/joid/joid-daily-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/octopus/octopus.yml | 11 | ||||
-rw-r--r-- | jjb/prediction/prediction.yml | 8 | ||||
-rw-r--r-- | jjb/releng/opnfv-lint.yml | 2 | ||||
-rw-r--r-- | jjb/releng/opnfv-utils.yml | 1 | ||||
-rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yml | 18 |
19 files changed, 89 insertions, 142 deletions
diff --git a/jjb/apex/apex-unit-test.sh b/jjb/apex/apex-unit-test.sh index 3112c9d36..3f15847f2 100755 --- a/jjb/apex/apex-unit-test.sh +++ b/jjb/apex/apex-unit-test.sh @@ -7,6 +7,8 @@ echo "Starting unit tests for Apex..." echo "---------------------------------------------------------------------------------------" echo +PATH=$PATH:/usr/sbin + pushd build/ > /dev/null for pkg in yamllint rpmlint iproute epel-release python34-devel python34-nose python34-PyYAML python-pep8 python34-mock python34-pip; do diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 849720336..587a06377 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -82,16 +82,10 @@ <<: *fraser - 'os-nosdn-bar-noha': <<: *fraser - - 'os-nosdn-nofeature-ha-ipv6': - <<: *fraser - 'os-nosdn-ovs_dpdk-noha': <<: *fraser - 'os-nosdn-ovs_dpdk-ha': <<: *fraser - - 'os-nosdn-kvm_ovs_dpdk-noha': - <<: *fraser - - 'os-nosdn-kvm_ovs_dpdk-ha': - <<: *fraser - 'os-odl-sfc-noha': <<: *fraser - 'os-odl-sfc-ha': @@ -496,6 +490,7 @@ - multijob: name: 'Baremetal Deploy' condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -505,7 +500,16 @@ GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: FAILURE + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-fetch-logs-{scenario_stream}' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + node-parameters: true + kill-phase-on: NEVER abort-all-job: true git-revision: false - multijob: @@ -1224,14 +1228,6 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-fraser' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser' node-parameters: false current-parameters: false @@ -1248,22 +1244,6 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-fraser' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-fraser' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - name: 'apex-os-odl-sfc-noha-baremetal-fraser' node-parameters: false current-parameters: false diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index dac7c3a88..4620bbc7e 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -374,6 +374,7 @@ - multijob: name: 'Baremetal Deploy' condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -383,7 +384,16 @@ GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: FAILURE + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-fetch-logs-{scenario_stream}' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + node-parameters: true + kill-phase-on: NEVER abort-all-job: true git-revision: false - multijob: diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index c74e3c83d..5bf64c11d 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -164,9 +164,7 @@ - condition-kind: day-of-week day-selector: select-days days: - MON: true - WED: true - FRI: true + SAT: true use-build-time: true steps: - trigger-builds: @@ -189,7 +187,7 @@ - condition-kind: day-of-week day-selector: select-days days: - TUES: true + SUN: true use-build-time: true steps: - trigger-builds: @@ -250,6 +248,7 @@ gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' + - testapi-parameter - string: name: DEPLOY_SCENARIO default: 'os-odl-nofeature-ha' @@ -262,6 +261,7 @@ name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' builders: + - track-begin-timestamp - shell: !include-raw-escape: ../fuel/fuel-deploy.sh @@ -269,6 +269,7 @@ - email: recipients: armband@enea.com - email-jenkins-admins-on-failure + - report-provision-result ######################## # trigger macros diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml index 56aee174c..cd3831310 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml @@ -34,7 +34,6 @@ - dovetail - dpacc - enfv - - fastpathmetrics - fds - fuel - functest @@ -43,12 +42,9 @@ - kvmfornfv - models - moon - - multisite - netready - nfvbench - - octopus - onosfw - - openretriever - opera - opnfvdocs - orchestra @@ -159,7 +155,7 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|escalator|fds|fuel|functest|octopus|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|lsoapi|models|moon|multisite|netready' + project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 0d5f92c2a..5f82803b6 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -790,7 +790,7 @@ - trigger: name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger' triggers: - - timed: '' + - timed: '0 5 1-29/2 * *' - trigger: name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger' triggers: @@ -802,7 +802,7 @@ - trigger: name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger' triggers: - - timed: '' + - timed: '0 7 2-30/2 * *' # --------------------- # noha-baremetal-fraser diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml index 444b17361..c357ff641 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yml +++ b/jjb/compass4nfv/compass-verify-jobs.yml @@ -14,14 +14,14 @@ gs-pathname: '' ppa-pathname: '/{stream}' disabled: false - openstack-version: 'ocata' + openstack-version: 'pike' branch-type: 'master' - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' ppa-pathname: '/{stream}' disabled: false - openstack-version: 'ocata' + openstack-version: 'pike' branch-type: 'master' distro: diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index 593d21ad0..1769bb4da 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -155,27 +155,20 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: 'baremetal' - label: '{pod}' - steps: - - trigger-builds: - - project: 'yardstick-daisy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - UPSTREAM_JOB_NAME=$JOB_NAME - UPSTREAM_BUILD_ID=$BUILD_ID - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-daisy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO={scenario} + INSTALLER_VERSION={stream} + UPSTREAM_JOB_NAME=$JOB_NAME + UPSTREAM_BUILD_ID=$BUILD_ID + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: '{project}-deploy-{pod}-daily-{stream}' diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 5732100be..3985356c1 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -121,7 +121,9 @@ branch: '{branch}' - '{installer}-defaults' - 'doctor-slave-parameter' - - 'doctor-parameter' + - 'doctor-parameter': + docker-tag: '{docker-tag}' + scenario: '{scenario}' - 'doctor-functest-parameter' scm: - git-scm-gerrit diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index d01128385..f74b10754 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -213,7 +213,7 @@ if [[ ! -f ${ubuntu_image} ]]; then fi sudo cp ${ubuntu_image} ${DOVETAIL_IMAGES} -# functest needs to download this image first before running +# yardstick and bottlenecks need to download this image first before running cirros_image=${image_path}/cirros-0.3.5-x86_64-disk.img if [[ ! -f ${cirros_image} ]]; then echo "Download image cirros-0.3.5-x86_64-disk.img ..." @@ -221,6 +221,14 @@ if [[ ! -f ${cirros_image} ]]; then fi sudo cp ${cirros_image} ${DOVETAIL_IMAGES} +# functest needs to download this image first before running +cirros_image=${image_path}/cirros-0.4.0-x86_64-disk.img +if [[ ! -f ${cirros_image} ]]; then + echo "Download image cirros-0.4.0-x86_64-disk.img ..." + wget -q -nc http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P ${image_path} +fi +sudo cp ${cirros_image} ${DOVETAIL_IMAGES} + # snaps_smoke test case needs to download this image first before running ubuntu14_image=${image_path}/ubuntu-14.04-server-cloudimg-amd64-disk1.img if [[ ! -f ${ubuntu14_image} ]]; then diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 4468da778..9a123053f 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -220,7 +220,7 @@ builders: - shell: | cd $WORKSPACE && tox -edocs - wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs" + wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/build" "docs" ################################ # job publishers ################################ diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index d70e7e0a5..b7335fafa 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -106,6 +106,12 @@ branches: - 'origin/$BRANCH' timeout: 15 + per-build-tag: false + shallow-clone: false + use-author: false + ignore-notify: false + wipe-workspace: true + prune: false - scm: name: git-scm-gerrit @@ -686,22 +692,6 @@ JBuchanan@advaoptical.com - publisher: - name: 'email-escalator-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - kong.wei2@zte.com.cn - -- publisher: - name: 'email-fastpathmetrics-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - maryam.tahhan@intel.com - -- publisher: name: 'email-fds-ptl' publishers: - email-ext: @@ -766,14 +756,6 @@ ruan.he@orange.com - publisher: - name: 'email-multisite-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - joehuang@huawei.com - -- publisher: name: 'email-netready-ptl' publishers: - email-ext: @@ -790,14 +772,6 @@ ahothan@cisco.com - publisher: - name: 'email-octopus-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - ulrich.kleber@huawei.com - -- publisher: name: 'email-onosfw-ptl' publishers: - email-ext: @@ -806,14 +780,6 @@ su.wei@huawei.com - publisher: - name: 'email-openretriever-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - jiaxuan@chinamobile.com - -- publisher: name: 'email-opera-ptl' publishers: - email-ext: diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index ee6357890..9d8bed45f 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -1015,17 +1015,6 @@ description: 'SSH key to be used' - parameter: - name: 'multisite-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'multisite-virtual' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: name: 'ericsson-virtual5-defaults' parameters: - label: diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index 1e92fbfef..2719c7292 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -316,7 +316,7 @@ - trigger: name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger' triggers: - - timed: '5 23 * * *' + - timed: '' # Disabled as there is no branch for orchestra # os-nosdn-openbaton-ha trigger - branch: master - trigger: name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger' diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml deleted file mode 100644 index a04d7f10d..000000000 --- a/jjb/octopus/octopus.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -################################ -# job configuration for Octopus -################################ -- project: - name: octopus - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml deleted file mode 100644 index b686d9524..000000000 --- a/jjb/prediction/prediction.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: prediction - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml index e478977e5..aac8c3160 100644 --- a/jjb/releng/opnfv-lint.yml +++ b/jjb/releng/opnfv-lint.yml @@ -172,7 +172,7 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'armband|fuel|octopus|releng-anteater' + project-pattern: 'armband|fuel|releng-anteater' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml index fb3bab42b..19fb4b5af 100644 --- a/jjb/releng/opnfv-utils.yml +++ b/jjb/releng/opnfv-utils.yml @@ -129,6 +129,7 @@ default-slaves: - lf-build1 - lf-build2 + - ericsson-build4 allowed-multiselect: true ignore-offline-nodes: true - project-parameter: diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml index 9814d47ef..4df3f520d 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yml +++ b/jjb/yardstick/yardstick-daily-jobs.yml @@ -183,6 +183,16 @@ installer: daisy auto-trigger-name: 'daily-trigger-disabled' <<: *fraser + - zte-pod9: + slave-label: '{pod}' + installer: daisy + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - zte-pod9: + slave-label: '{pod}' + installer: daisy + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser - orange-pod2: slave-label: '{pod}' installer: joid @@ -460,6 +470,14 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: + name: 'yardstick-params-zte-pod9' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: name: 'yardstick-params-orange-pod1' parameters: - string: |