diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 50 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 12 |
2 files changed, 20 insertions, 42 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index b07ccd660..3f6b3e76a 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 @@ -1339,7 +1335,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 +1343,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 +1351,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 +1359,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 +1367,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 +1391,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 +1407,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 +1415,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 +1439,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/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' |