Apex: Migrates master daily to label driven slave

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index f63efd4..282ae7b 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -19,12 +19,14 @@
             block-stream: 'brahmaputra'
             slave: 'intel-pod7'
             verify-slave: 'apex-verify-master'
             block-stream: 'brahmaputra'
             slave: 'intel-pod7'
             verify-slave: 'apex-verify-master'

+            daily-slave: 'apex-daily-master'

         - brahmaputra:
             branch: 'stable/brahmaputra'
             gs-pathname: '/brahmaputra'
             block-stream: 'master'
             slave: 'opnfv-jump-1'
             verify-slave: 'apex-verify-brahmaputra'
         - brahmaputra:
             branch: 'stable/brahmaputra'
             gs-pathname: '/brahmaputra'
             block-stream: 'master'
             slave: 'opnfv-jump-1'
             verify-slave: 'apex-verify-brahmaputra'

+            daily-slave: 'apex-daily-brahmaputra'

             disabled: true
 
     stream1:
             disabled: true
 
     stream1:


@@ -34,6 +36,7 @@
             block-stream: 'brahmaputra'
             slave: 'intel-pod7'
             verify-slave: 'apex-verify-master'
             block-stream: 'brahmaputra'
             slave: 'intel-pod7'
             verify-slave: 'apex-verify-master'

+            daily-slave: 'apex-daily-master'

 
     stream2:
         - brahmaputra:
 
     stream2:
         - brahmaputra:


@@ -42,6 +45,7 @@
             block-stream: 'master'
             slave: 'opnfv-jump-1'
             verify-slave: 'apex-verify-brahmaputra'
             block-stream: 'master'
             slave: 'opnfv-jump-1'
             verify-slave: 'apex-verify-brahmaputra'

+            daily-slave: 'apex-daily-brahmaputra'

             disabled: true
 
     project: 'apex'
             disabled: true
 
     project: 'apex'


@@ -581,7 +585,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)

-    node: '{slave}'
+    node: '{daily-slave}'

 
     disabled: false
 
 
     disabled: false
 


@@ -621,12 +625,14 @@
               BUILD_DIRECTORY=apex-build-{stream1}/build
               OPNFV_CLEAN=yes
             git-revision: true
               BUILD_DIRECTORY=apex-build-{stream1}/build
               OPNFV_CLEAN=yes
             git-revision: true

+            same-node: true

             block: true
         - trigger-builds:
           - project: 'functest-apex-{slave}-daily-{stream1}'
             predefined-parameters:
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha
             block: true
             block: true
         - trigger-builds:
           - project: 'functest-apex-{slave}-daily-{stream1}'
             predefined-parameters:
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha
             block: true

+            same-node: true

             block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
             block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'


@@ -636,6 +642,7 @@
             predefined-parameters:
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha
             block: true
             predefined-parameters:
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha
             block: true

+            same-node: true

             block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
             block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'