From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 23 May 2019 01:24:52 +0000 (+0000)
Subject: Merge "[iec] Trigger all usecases in parent jobs"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=3fa2500d131a4537a1755e340ceccd4d6ba1a0e7;hp=b2d363e0cde9fcc4912ae3e7e09cf273dcb24f18

Merge "[iec] Trigger all usecases in parent jobs"
---

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index faab545..8e2546b 100644
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -17,7 +17,7 @@
     # -------------------------------
     # DEPLOY TYPE DEFINITIONS
     # -------------------------------
-    deploy-type:
+    deploy_type:
       - fuel-baremetal:
           slave-label: 'aarch64_dev'
           scenario: 'k8-calico-iec-noha'
@@ -37,9 +37,9 @@
           scenario: 'k8-calico-iec-noha'
 
     jobs:
-      - 'iec-{deploy-type}-daily-{stream}'
-      - 'iec-deploy-{deploy-type}-daily-{stream}'
-      - 'iec-install-{usecase}-{deploy-type}-daily-{stream}'
+      - 'iec-{deploy_type}-daily-{stream}'
+      - 'iec-deploy-{deploy_type}-daily-{stream}'
+      - 'iec-install-{usecase}-{deploy_type}-daily-{stream}'
 
 ##############
 # PARAMETERS #
@@ -87,7 +87,7 @@
 # job templates
 ########################
 - job-template:
-    name: 'iec-{deploy-type}-daily-{stream}'
+    name: 'iec-{deploy_type}-daily-{stream}'
     disabled: '{obj:disabled}'
     concurrent: false
     node: '{slave-label}'
@@ -100,7 +100,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '.*-{deploy-type}-daily-.*'
+            - '.*-{deploy_type}-daily-.*'
           blocking-level: 'NODE'
 
     wrappers:
@@ -108,7 +108,7 @@
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     triggers:
-      - 'iec-{deploy-type}-daily-{stream}-trigger'
+      - 'iec-{deploy_type}-daily-{stream}-trigger'
 
     parameters:
       - lf-infra-parameters:
@@ -122,19 +122,24 @@
 
     builders:
       - trigger-builds:
-          - project: 'iec-deploy-{deploy-type}-daily-{stream}'
+          - project: 'iec-deploy-{deploy_type}-daily-{stream}'
             current-parameters: false
-            predefined-parameters: |
+            predefined-parameters:
               DEPLOY_SCENARIO={scenario}
             same-node: true
             block: true
-          - project: 'iec-install-{usecase}-daily-{stream}'
+          - project:
+              !j2: |
+                {%- for uc in usecase -%}
+                iec-install-{{ uc | first }}-{{ deploy_type }}-daily-{{ stream }}
+                {%- if not loop.last -%},{%- endif -%}
+                {%- endfor %}
             current-parameters: false
             same-node: true
             block: true
 
 - job-template:
-    name: 'iec-deploy-{deploy-type}-daily-{stream}'
+    name: 'iec-deploy-{deploy_type}-daily-{stream}'
     concurrent: true
     node: '{slave-label}'
     properties:
@@ -146,7 +151,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '.*-deploy-{deploy-type}-daily-*'
+            - '.*-deploy-{deploy_type}-daily-*'
           blocking-level: 'NODE'
 
     parameters:
@@ -184,7 +189,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: 'compass-.*'
-          label: '{deploy-type}'
+          label: '{deploy_type}'
           steps:
             - shell:
                 !include-raw-escape: ./iec-compass-build.sh
@@ -195,7 +200,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: 'fuel-.*'
-          label: '{deploy-type}'
+          label: '{deploy_type}'
           steps:
             - shell:
                 !include-raw-escape: ./iec-fuel-deploy.sh
@@ -206,7 +211,7 @@
       - lf-infra-publish
 
 - job-template:
-    name: 'iec-install-{usecase}-{deploy-type}-daily-{stream}'
+    name: 'iec-install-{usecase}-{deploy_type}-daily-{stream}'
     concurrent: true
     node: '{slave-label}'
     properties:
@@ -218,8 +223,8 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '.*-deploy-{deploy-type}-daily-*'
-            - '.*-install-{usecase}-{deploy-type}-daily-*'
+            - '.*-deploy-{deploy_type}-daily-*'
+            - '.*-install-{usecase}-{deploy_type}-daily-*'
           blocking-level: 'NODE'
 
     parameters:
@@ -232,7 +237,7 @@
 
     wrappers:
       - build-name:
-          name: '$BUILD_NUMBER - Usecase: ${usecase} DeployType: ${deploy-type}'
+          name: '$BUILD_NUMBER - Usecase: ${usecase} DeployType: ${deploy_type}'
 
     scm: *scm