From 7916ec7289c1cbb6d792243572d9118cd7e3c296 Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Thu, 14 Sep 2017 09:38:44 -0700
Subject: Merge Apex Daily Jobs

Merged 'apex-daily-master' and 'apex-daily-danube' into
'apex-daily-{stream}'

Change-Id: I2b1e9e3dd0869b6a1f2b1b6415b364a2d9f151d2
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 jjb/apex/apex.yml.j2 | 60 ++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

(limited to 'jjb/apex/apex.yml.j2')

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index df8cf92c0..410241c44 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -7,8 +7,7 @@
         - 'apex-verify-unit-tests-{stream}'
         - 'apex-runner-cperf-{stream}'
         - 'apex-deploy-{platform}-{stream}'
-        - 'apex-daily-master'
-        - 'apex-daily-danube'
+        - 'apex-daily-{stream}'
         - 'apex-csit-promote-daily-{stream}'
         - 'apex-fdio-promote-daily-{stream}'
         - 'apex-{scenario}-baremetal-{scenario_stream}'
@@ -689,10 +688,8 @@
 #            steps:
 #                - shell: 'echo "Tests Passed"'
 
-{% for stream in scenarios %}
-# {{ stream }} Daily
 - job-template:
-    name: 'apex-daily-{{ stream }}'
+    name: 'apex-daily-{stream}'
 
     # Job template for daily build
     #
@@ -701,7 +698,7 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{{ build_slave[stream] }}'
+    node: '{baremetal-slave}'
 
     disabled: false
 
@@ -710,25 +707,25 @@
 
     parameters:
         - '{project}-defaults'
-        - '{project}-baremetal-{{ stream }}-defaults'
+        - '{project}-baremetal-{stream}-defaults'
         - project-parameter:
             project: '{project}'
-            branch: '{{ branch[stream] }}'
+            branch: '{branch}'
         - apex-parameter:
-            gs-pathname: '{{ gspathname[stream] }}'
+            gs-pathname: '{gs-pathname}'
 
     properties:
         - logrotate-default
 
     triggers:
-        - 'apex-{{ stream }}'
+        - 'apex-{stream}'
 
     builders:
         - multijob:
             name: build
             condition: SUCCESSFUL
             projects:
-                - name: 'apex-build-{{ stream }}'
+                - name: 'apex-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
@@ -743,10 +740,10 @@
             name: 'Verify and upload ISO'
             condition: SUCCESSFUL
             projects:
-                - name: 'apex-verify-iso-{{ stream }}'
+                - name: 'apex-verify-iso-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-{{ stream }}/.build
+                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-{stream}/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -755,21 +752,7 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: true
-        - multijob:
-            name: Baremetal Deploy and Test Phase
-            condition: SUCCESSFUL
-            projects:
-{% for scenario in scenarios[stream] %}
-                - name: 'apex-{{ scenario }}-baremetal-{{ stream }}'
-                  node-parameters: false
-                  current-parameters: false
-                  predefined-parameters: |
-                    OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                  git-revision: false
-{% endfor %}
-{% endfor %}
+        - apex-builder-{stream}
 
 # snapshot create
 - job-template:
@@ -1194,6 +1177,27 @@
 ########################
 # builder macros
 ########################
+{% for stream in scenarios %}
+# {{ stream }} Builder
+- builder:
+      name: apex-builder-{{ stream }}
+      builders:
+        - multijob:
+            name: Baremetal Deploy and Test Phase
+            condition: SUCCESSFUL
+            projects:
+{% for scenario in scenarios[stream] %}
+                - name: 'apex-{{ scenario }}-baremetal-{{ stream }}'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
+{% endfor %}
+{% endfor %}
+
 - builder:
     name: 'apex-unit-test'
     builders:
-- 
cgit 1.2.3-korg