X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fiec%2Fiec.yaml;h=dc47acf288ad7d3cd357511e80faae489cc48431;hp=bf2f64803f673608e3d28fee6d6d58e9da295152;hb=7cb83b7f5818727f5293fc02b96d5e5f065a78a1;hpb=27d29d845db84ac1768770fbdff8a593a41bc66b

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index bf2f648..dc47acf 100644
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -91,33 +91,55 @@
           name: ARCHIVE_ARTIFACTS
           default: '**/*.log'
           description: Artifacts to archive to the logs server.
-- parameter:
-    name: 'seba_on_arm-defaults'
+# Usecase params are both installer and OS specific
+- parameter: &k8s_fuel_ubuntu1604_parameter
+    name: 'fuel-ubuntu1604-defaults'
     parameters:
-      - string:
+      - string: &k8s_master_ip
+          name: K8S_MASTER_IP
+          default: ''
+          description: 'IP address to connect to the K8s master'
+      - string: &k8s_ssh_user
           name: K8S_SSH_USER
           default: 'ubuntu'
           description: 'SSH username to connect to the K8s master '
-      - string:
+      - string: &k8s_ssh_password
           name: K8S_SSH_PASSWORD
           default: ''
           description: 'SSH password to connect to the K8s master'
-      - string:
+      - string: &k8s_ssh_key
           name: K8S_SSH_KEY
           default: ''
           description: 'SSH key to connect to the K8s master'
+- parameter:
+    <<: *k8s_fuel_ubuntu1604_parameter
+    name: 'fuel-ubuntu1804-defaults'
+- parameter:
+    name: 'fuel-centos7-defaults'
+    parameters:
+      - string:
+          <<: *k8s_master_ip
+      - string:
+          <<: *k8s_ssh_user
+          default: 'centos'
       - string:
-          name: K8S_MASTER_IP_COMPASS
+          <<: *k8s_ssh_password
+      - string:
+          <<: *k8s_ssh_key
+- parameter:
+    name: 'compass-ubuntu1604-defaults'
+    parameters:
+      - string:
+          <<: *k8s_master_ip
           default: '10.1.0.50'
-          description: 'IP address to compass connect to the K8s master'
       - string:
-          name: K8S_SSH_PASSWORD_COMPASS
+          <<: *k8s_ssh_user
           default: 'root'
-          description: 'SSH password to compass connect to the K8s master'
       - string:
-          name: K8S_SSH_USER_COMPASS
+          <<: *k8s_ssh_password
           default: 'root'
-          description: 'SSH username to compass connect to the K8s master'
+      - string:
+          <<: *k8s_ssh_key
 
 ########################
 # job templates
@@ -153,6 +175,7 @@
           stream: '{stream}'
           branch: '{branch}'
       - '{project}-defaults'
+      - '{installer}-{os}-defaults'
       - string:
           name: DEPLOY_SCENARIO
           default: '{scenario}'
@@ -160,18 +183,27 @@
     builders:
       - trigger-builds:
           - project: 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
-            current-parameters: false
+            current-parameters: true
             predefined-parameters:
               DEPLOY_SCENARIO={scenario}
             same-node: true
             block: true
+          - project: 'validation-enea-daily-{stream}'
+            same-node: true
+            current-parameters: true
+            predefined-parameters: |
+              BLUEPRINT={project-name}
+              LAYER=k8s
+              VERSION=master
+              OPTIONAL=yes
+            block: true
           - project:
               !j2: |
                 {%- for uc in usecase -%}
                 iec-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
                 {%- if not loop.last -%},{%- endif -%}
                 {%- endfor %}
-            current-parameters: false
+            current-parameters: true
             same-node: true
             block: true
             block-thresholds:
@@ -303,7 +335,6 @@
           stream: '{stream}'
           branch: '{branch}'
       - '{project}-defaults'
-      - '{usecase}-defaults'
 
     wrappers:
       - build-name: