Merge "Fix iec view bug & Remove useless file"

[ci-management.git] / jjb / iec / iec.yaml

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index 9751825..86752e1 100644 (file)
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -6,7 +6,7 @@
     views:
       - common-view:
           view-name: iec
-          view-regex: '^{project-name}-(tox|fuel|compass)-.*'
+          view-regex: '^{project-name}-(tox|type1|type2)-(verify|fuel|compass)-.*'
     # -------------------------------
     # BRANCH DEFINITIONS
     # -------------------------------
@@ -224,9 +224,9 @@
               unstable-threshold: 'FAILURE'
           - project: 'iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
-              IEC_TYPE='{iecType}'
+              IEC_TYPE={iecType}
             same-node: true
             block: true
 
@@ -254,6 +254,7 @@
           stream: '{stream}'
           branch: '{branch}'
       - '{project}-defaults'
+      - '{installer}-{os}-defaults'
       - string:
           name: DEPLOY_SCENARIO
           default: '{scenario}'
@@ -321,6 +322,7 @@
           stream: '{stream}'
           branch: '{branch}'
       - '{project}-defaults'
+      - '{installer}-{os}-defaults'
       - string:
           name: DEPLOY_SCENARIO
           default: '{scenario}'
@@ -354,6 +356,7 @@
           stream: '{stream}'
           branch: '{branch}'
       - '{project}-defaults'
+      - '{installer}-{os}-defaults'
 
     wrappers:
       - build-name: