From f5b81c26a751dcfcbdd8918f8fc38351c94147a7 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 21 May 2018 12:41:48 -0400 Subject: [PATCH] Apex: Updates daily master scenario names Change-Id: I881634a57f1d28cfcc3346476dc095873c014a22 Signed-off-by: Tim Rozet --- jjb/apex/apex.yaml | 28 ++++++++++++++++++++++++---- jjb/apex/scenarios.yaml.hidden | 2 ++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 587a06377..51b783ecd 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -144,9 +144,13 @@ <<: *danube - 'os-ovn-nofeature-noha': <<: *danube - - 'os-odl-master_upstream-noha': + - 'os-odl-nofeature-noha': + <<: *master + - 'os-odl-nofeature-ha': <<: *master - - 'os-odl-queens_upstream-noha': + - 'os-odl-queens-noha': + <<: *master + - 'os-odl-queens-ha': <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates @@ -1494,7 +1498,23 @@ name: Baremetal Deploy and Test Phase condition: SUCCESSFUL projects: - - name: 'apex-os-odl-master_upstream-noha-baremetal-master' + - name: 'apex-os-odl-nofeature-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-nofeature-ha-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-queens-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1502,7 +1522,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-queens_upstream-noha-baremetal-master' + - name: 'apex-os-odl-queens-ha-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 2650eafbb..8375f6163 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -1,6 +1,8 @@ master: - 'os-odl-nofeature-noha' + - 'os-odl-nofeature-ha' - 'os-odl-queens-noha' + - 'os-odl-queens-ha' fraser: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' -- 2.16.6