Apex: Updates daily master scenario names

Change-Id: I881634a57f1d28cfcc3346476dc095873c014a22
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 587a063..51b783e 100644 (file)
--- 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 2650eaf..8375f61 100644 (file)
--- 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'