X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-iec-templates.yaml;h=c60e915f201c062ecdae5e61f305b54e947382e2;hp=0f6230700fae3c4c740599af4b5ef0be9e975f93;hb=c1b6901cf2821ce7c9fe422d33ad33f04dca3dee;hpb=0f396c52b140bc5279ea38c2c93b603d5d4c79a3

diff --git a/jjb/akraino-templates/akraino-iec-templates.yaml b/jjb/akraino-templates/akraino-iec-templates.yaml
index 0f62307..c60e915 100644
--- a/jjb/akraino-templates/akraino-iec-templates.yaml
+++ b/jjb/akraino-templates/akraino-iec-templates.yaml
@@ -56,16 +56,20 @@
               CLUSTER_SSH_PASSWORD=$K8S_SSH_PASSWORD
               CLUSTER_SSH_KEY=$K8S_SSH_KEY
               BLUEPRINT={project-name}
-              LAYER=k8s
               VERSION=master
               OPTIONAL=false
             block: true
           - project:
               !j2: |
+                {%- if deploy_type not in ['virtual'] -%}
                 {%- for uc in usecase -%}
-                iec-{{ iecType }}-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
+                {%- for ph in phase -%}
+                iec-{{ iecType }}-{{ ph }}-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
                 {%- if not loop.last -%},{%- endif -%}
                 {%- endfor %}
+                {%- if not loop.last -%},{%- endif -%}
+                {%- endfor %}
+                {%- endif -%}
             current-parameters: true
             same-node: true
             block: true
@@ -125,9 +129,8 @@
       - git:
           credentials-id: '{jenkins-ssh-credential}'
           url: '{git-url}/{project}.git'
-          refspec: ''
-          branches:
-            - 'refs/heads/{branch}'
+          refspec: '$GERRIT_REFSPEC'
+          branches: '$GERRIT_BRANCH'
           skip-tag: true
           wipe-workspace: true
           submodule:
@@ -198,8 +201,8 @@
     publishers: *publishers
 
 - job-template:
-    id: akraino-iec-install-usecase
-    name: 'iec-{iecType}-install-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
+    id: akraino-iec-phase-usecase
+    name: 'iec-{iecType}-{phase}-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
     concurrent: true
     node: '{slave-label}'
     properties: *properties
@@ -211,6 +214,7 @@
           branch: '{branch}'
       - '{project}-defaults'
       - '{installer}-{os}-defaults'
+      - '{usecase}-defaults'
 
     wrappers:
       - build-name:
@@ -223,4 +227,3 @@
           !include-raw-escape: ../iec/iec-{usecase}.sh
 
     publishers: *publishers
-