From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 15 Apr 2020 18:16:07 +0000 (+0000)
Subject: Merge "validation, iec: Rework common parameters list"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=2334a188f297454f6e89ef7626bce4e963511048;hp=15ca162dfa0f9acbb14c296f1cc74ca6c4f980ba

Merge "validation, iec: Rework common parameters list"
---

diff --git a/jjb/akraino-templates/akraino-iec-macros.yaml b/jjb/akraino-templates/akraino-iec-macros.yaml
index 7553f9a..4bd825a 100644
--- a/jjb/akraino-templates/akraino-iec-macros.yaml
+++ b/jjb/akraino-templates/akraino-iec-macros.yaml
@@ -77,6 +77,7 @@
           default: 'root'
       - string:
           <<: *k8s_ssh_key
+          default: ''
 
 # IEC usecase(s) parameters
 - parameter:
diff --git a/jjb/akraino-templates/akraino-validation-macros.yaml b/jjb/akraino-templates/akraino-validation-macros.yaml
index 471d2b9..6bdcdce 100644
--- a/jjb/akraino-templates/akraino-validation-macros.yaml
+++ b/jjb/akraino-templates/akraino-validation-macros.yaml
@@ -5,66 +5,51 @@
 - parameter:
     name: bluval-defaults
     parameters:
-      - string: &cluster_master_ip
+      - lab_params
+      - string:
+          name: LAB_SILO
+          default: ''
+          description: 'Folder in nexus where the logs are pushed.'
+      - string:
+          name: SETTINGS_FILE
+          default: '/home/jenkins/settings.xml'
+          description: 'Path to credentials file'
+
+- parameter:
+    name: lab_params
+    parameters:
+      - string:
           name: CLUSTER_MASTER_IP
           default: ''
           description: 'IP address to connect to the cluster master'
-      - string: &cluster_ssh_user
+      - string:
           name: CLUSTER_SSH_USER
           default: ''
           description: 'SSH username to connect to the cluster master '
-      - string: &cluster_ssh_password
+      - string:
           name: CLUSTER_SSH_PASSWORD
           default: ''
           description: 'SSH password to connect to the cluster master'
-      - string: &cluster_ssh_key
+      - string:
           name: CLUSTER_SSH_KEY
           default: ''
           description: 'SSH key to connect to the cluster master'
-      - string: &blueprint_name
+      - string:
           name: BLUEPRINT
           default: ''
           description: 'Blueprint used'
-      - string: &layer
+      - string:
           name: LAYER
           default: ''
           description: 'Layer'
-      - string: &version
+      - string:
           name: VERSION
           default: ''
           description: 'Version'
-      - string: &optional
+      - string:
           name: OPTIONAL
           default: ''
           description: 'If set to yes run optional tests'
-      - string:
-          name: LAB_SILO
-          default: ''
-          description: 'Folder in nexus where the logs are pushed.'
-      - string:
-          name: SETTINGS_FILE
-          default: '/home/jenkins/settings.xml'
-          description: 'Path to credentials file'
-
-- parameter:
-    name: lab_params
-    parameters:
-      - string:
-          <<: *cluster_master_ip
-      - string:
-          <<: *cluster_ssh_user
-      - string:
-          <<: *cluster_ssh_password
-      - string:
-          <<: *cluster_ssh_key
-      - string:
-          <<: *blueprint_name
-      - string:
-          <<: *layer
-      - string:
-          <<: *version
-      - string:
-          <<: *optional
 
 ############
 # SETTINGS #