Apex: Fixes daily to use baremetal

Also includes change to move virtual deployment for daily to be noha
(due to RAM limitation in LFPOD1)

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 25b30b4..f9c6b83 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -51,13 +51,14 @@
     project: 'apex'
 
     scenario:
+         - 'os-nosdn-nofeature-noha'
          - 'os-nosdn-nofeature-ha'
          - 'os-odl_l2-nofeature-ha'
          - 'os-odl_l2-bgpvpn-ha'
          - 'os-odl_l2-sfc-noha'
          - 'os-odl_l3-nofeature-ha'
          - 'os-onos-nofeature-ha'
-         - 'os-opencontrail-nofeature-ha'
+         - 'os-ocl-nofeature-ha'
 
     platform:
          - 'baremetal'
@@ -357,7 +358,7 @@
     builders:
         - 'apex-build'
         - trigger-builds:
-          - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
+          - project: 'apex-deploy-virtual-os-nosdn-nofeature-noha-{stream}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-build-{stream}/build
               OPNFV_CLEAN=yes
@@ -642,7 +643,7 @@
             same-node: true
             block: true
         - trigger-builds:
-          - project: 'apex-deploy-virtual-nosdn-nofeature-ha-{stream1}'
+          - project: 'apex-deploy-baremetal-os-nosdn-nofeature-ha-{stream1}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-build-{stream1}/build
               OPNFV_CLEAN=yes