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=86905143e90784ebffa7993780ef5f96a50a79e4;hp=df14cbe4fa0f029c26d6ea123c16baa6cf3a3f05;hb=15ca162dfa0f9acbb14c296f1cc74ca6c4f980ba;hpb=bc7b1438041402599cdcff0433c4c8ab62c8348d

diff --git a/jjb/akraino-templates/akraino-iec-templates.yaml b/jjb/akraino-templates/akraino-iec-templates.yaml
index df14cbe..8690514 100644
--- a/jjb/akraino-templates/akraino-iec-templates.yaml
+++ b/jjb/akraino-templates/akraino-iec-templates.yaml
@@ -61,10 +61,15 @@
             block: true
           - project:
               !j2: |
+                {%- if deploy_type not in ['virtual'] -%}
                 {%- for uc in usecase -%}
-                iec-{{ iecType }}-install-{{ uc }}-{{ 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
@@ -121,17 +126,14 @@
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE'
 
     scm: &scm
-      - git:
-          credentials-id: '{jenkins-ssh-credential}'
-          url: '{git-url}/{project}.git'
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}/{project}.git'
           refspec: '$GERRIT_REFSPEC'
-          branches: '$GERRIT_BRANCH'
-          skip-tag: true
-          wipe-workspace: true
-          submodule:
-            disable: true
-            recursive: false
-            timeout: '{submodule-timeout}'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: false
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: true
           choosing-strategy: default
 
     builders:
@@ -196,8 +198,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
@@ -209,6 +211,7 @@
           branch: '{branch}'
       - '{project}-defaults'
       - '{installer}-{os}-defaults'
+      - '{usecase}-defaults'
 
     wrappers:
       - build-name:
@@ -221,4 +224,3 @@
           !include-raw-escape: ../iec/iec-{usecase}.sh
 
     publishers: *publishers
-