diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-09-11 18:11:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-11 18:11:40 +0000 |
| commit | aa6ebe41c388f115c4f4aa7543bc75f5e39a4f0f (patch) | |
| tree | 107990cbd1cdbd2f355cc0078a3b93ad095c2f22 /jjb | |
| parent | 8a022401a11144f90455e94aa110b57a1a7c2909 (diff) | |
| parent | d22571ce191d958aa8da002e6b0268a5290b6971 (diff) | |
Merge "Updated calipso scenario for master"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yaml | 30 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 3 |
2 files changed, 22 insertions, 11 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 82f766e20..fd0e8269c 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -157,6 +157,10 @@ <<: *master - 'os-odl-sfc_queens-noha': <<: *master + - 'os-nosdn-calipso-noha': + <<: *master + - 'os-nosdn-calipso_queens-noha': + <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates - 'os-nosdn-nofeature-ha': @@ -191,8 +195,6 @@ <<: *euphrates - 'os-odl-sfc-ha': <<: *euphrates - - 'os-nosdn-calipso-noha': - <<: *euphrates platform: - 'baremetal' @@ -1649,6 +1651,22 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - name: 'apex-os-nosdn-calipso-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-nosdn-calipso_queens-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 # euphrates Builder - builder: @@ -1794,14 +1812,6 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso-noha-baremetal-euphrates' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - builder: name: 'apex-upload-artifact' builders: diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index b032613a3..1e1ba3fc3 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -18,6 +18,8 @@ master: - 'os-odl-sfc-noha' - 'os-odl-sfc_queens-ha' - 'os-odl-sfc_queens-noha' + - 'os-nosdn-calipso-noha' + - 'os-nosdn-calipso_queens-noha' fraser: - 'os-nosdn-nofeature-ha' - 'os-odl-bgpvpn-ha' @@ -39,7 +41,6 @@ euphrates: - 'os-nosdn-kvm_ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - - 'os-nosdn-calipso-noha' danube: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' |