diff options
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 52 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 2 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 12 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 12 | ||||
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yml | 12 | ||||
| -rwxr-xr-x | jjb/functest/functest-k8.sh | 6 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 4 |
8 files changed, 48 insertions, 54 deletions
diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 421a3fa31..302932246 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -238,7 +238,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true + node-parameters: false kill-phase-on: FAILURE abort-all-job: true git-revision: true diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index b07ccd660..cf29b928c 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -112,37 +112,33 @@ <<: *master - 'os-odl-bgpvpn-noha': <<: *master + - 'os-odl-sriov-noha': + <<: *master + - 'os-odl-ovs_offload-noha': + <<: *master - 'os-ovn-nofeature-noha': <<: *master - 'os-nosdn-fdio-noha': <<: *master - 'os-nosdn-fdio-ha': <<: *master - - 'os-odl-fdio-noha': - <<: *master - - 'os-odl-fdio-ha': - <<: *master - 'os-nosdn-bar-ha': <<: *master - 'os-nosdn-bar-noha': <<: *master - - 'os-nosdn-nofeature-ha-ipv6': - <<: *master - 'os-nosdn-ovs_dpdk-noha': <<: *master - 'os-nosdn-ovs_dpdk-ha': <<: *master - - 'os-nosdn-kvm_ovs_dpdk-noha': + - 'os-odl-ovs_dpdk-noha': <<: *master - - 'os-nosdn-kvm_ovs_dpdk-ha': + - 'os-odl-ovs_dpdk-ha': <<: *master - 'os-odl-sfc-noha': <<: *master - 'os-odl-sfc-ha': <<: *master - - 'os-odl-fdio_dvr-noha': - <<: *master - - 'os-odl-fdio_dvr-ha': + - 'os-nosdn-calipso-noha': <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates @@ -315,6 +311,8 @@ project-type: 'multijob' + concurrent: true + disabled: false scm: @@ -1339,7 +1337,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-ovn-nofeature-noha-baremetal-master' + - name: 'apex-os-odl-sriov-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1347,7 +1345,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-fdio-noha-baremetal-master' + - name: 'apex-os-odl-ovs_offload-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1355,7 +1353,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-fdio-ha-baremetal-master' + - name: 'apex-os-ovn-nofeature-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1363,7 +1361,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-noha-baremetal-master' + - name: 'apex-os-nosdn-fdio-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1371,7 +1369,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-ha-baremetal-master' + - name: 'apex-os-nosdn-fdio-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1395,14 +1393,6 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master' - 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-master' node-parameters: false current-parameters: false @@ -1419,7 +1409,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-master' + - name: 'apex-os-odl-ovs_dpdk-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1427,7 +1417,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-master' + - name: 'apex-os-odl-ovs_dpdk-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1451,15 +1441,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio_dvr-noha-baremetal-master' - 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-fdio_dvr-ha-baremetal-master' + - name: 'apex-os-nosdn-calipso-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index b9cbd0240..ab65c4e2b 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -189,6 +189,8 @@ project-type: 'multijob' + concurrent: true + disabled: false scm: diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index 789ca7f7e..93ce931eb 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -5,22 +5,20 @@ master: - 'os-odl-nofeature-noha' - 'os-odl-bgpvpn-ha' - 'os-odl-bgpvpn-noha' + - 'os-odl-sriov-noha' + - 'os-odl-ovs_offload-noha' - 'os-ovn-nofeature-noha' - 'os-nosdn-fdio-noha' - 'os-nosdn-fdio-ha' - - 'os-odl-fdio-noha' - - 'os-odl-fdio-ha' - 'os-nosdn-bar-ha' - 'os-nosdn-bar-noha' - - 'os-nosdn-nofeature-ha-ipv6' - 'os-nosdn-ovs_dpdk-noha' - 'os-nosdn-ovs_dpdk-ha' - - 'os-nosdn-kvm_ovs_dpdk-noha' - - 'os-nosdn-kvm_ovs_dpdk-ha' + - 'os-odl-ovs_dpdk-noha' + - 'os-odl-ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - - 'os-odl-fdio_dvr-noha' - - 'os-odl-fdio_dvr-ha' + - 'os-nosdn-calipso-noha' euphrates: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index d8f43c9b2..ba76b8abb 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -88,11 +88,14 @@ projects: - name: 'doctor-verify-unit-test-{stream}' predefined-parameters: | + PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE + current-parameters: true + git-revision: true - job-template: name: 'doctor-verify-unit-test-{stream}' @@ -136,33 +139,42 @@ projects: - name: 'doctor-{task}-apex-{inspector}-x86_64-{stream}' predefined-parameters: | + PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE + current-parameters: true + git-revision: true - multijob: name: 'doctor-verify-fuel-inspector' execution-type: PARALLEL projects: - name: 'doctor-{task}-fuel-{inspector}-x86_64-{stream}' predefined-parameters: | + PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE + current-parameters: true + git-revision: true - multijob: name: 'doctor-verify-fuel-inspector' execution-type: PARALLEL projects: - name: 'doctor-{task}-fuel-{inspector}-aarch64-{stream}' predefined-parameters: | + PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE + current-parameters: true + git-revision: true - job-template: name: 'doctor-{task}-{installer}-{inspector}-{arch}-{stream}' diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml index 1cb29d091..bbc8a8493 100644 --- a/jjb/fuel/fuel-daily-jobs.yml +++ b/jjb/fuel/fuel-daily-jobs.yml @@ -412,11 +412,11 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger' triggers: - - timed: '0 20 * * *' + - timed: '' # '0 20 * * *' - trigger: name: 'fuel-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger' triggers: - - timed: '0 2 * * *' + - timed: '' # '0 2 * * *' - trigger: name: 'fuel-os-onos-sfc-ha-baremetal-daily-euphrates-trigger' triggers: @@ -432,7 +432,7 @@ - trigger: name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-euphrates-trigger' triggers: - - timed: '0 20 * * *' + - timed: '' # '0 20 * * *' - trigger: name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-euphrates-trigger' triggers: @@ -589,11 +589,11 @@ - trigger: name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger' triggers: - - timed: '0 13 * * *' + - timed: '' # '0 13 * * *' - trigger: name: 'fuel-os-odl-nofeature-noha-virtual-daily-euphrates-trigger' triggers: - - timed: '0 18 * * *' + - timed: '' # '0 18 * * *' - trigger: name: 'fuel-os-onos-sfc-noha-virtual-daily-euphrates-trigger' triggers: @@ -613,7 +613,7 @@ - trigger: name: 'fuel-os-nosdn-ovs-noha-virtual-daily-euphrates-trigger' triggers: - - timed: '0 9 * * *' + - timed: '' # '0 9 * * *' - trigger: name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-euphrates-trigger' triggers: diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 6df5c53b0..888aded81 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -11,12 +11,12 @@ rc_file=${HOME}/k8.creds sudo rm -rf $rc_file if [[ ${INSTALLER_TYPE} == 'compass' ]]; then - admin_conf_file_vol = "-v ${HOME}/admin.conf:/root/.kube/config" + admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config" echo "export KUBECONFIG=/root/.kube/config" >> $rc_file echo "export KUBERNETES_PROVIDER=local" >> $rc_file - KUBE_MASTER_URL = $(cat ${HOME}/admin.conf|grep server| awk '{print $2}') + KUBE_MASTER_URL=$(cat ${HOME}/admin.conf|grep server| awk '{print $2}') echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file - KUBE_MASTER_IP = $(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2') + KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2') echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file else echo "Not supported by other installers yet" diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index a7d947f81..a12a3c8a5 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -617,7 +617,7 @@ - email-ext: <<: *email_ptl_defaults recipients: > - hongbo.tianhongbo@huawei.com + georg.kunz@ericsson.com - publisher: name: 'email-dpacc-ptl' @@ -825,7 +825,7 @@ - email-ext: <<: *email_ptl_defaults recipients: > - jack.morgan@intel.com + zhang.jun3g@zte.com.cn - publisher: name: 'email-pharos-tools-ptl' <<: *email_pharos_ptl_defaults |