From eed0f03bf6091363a6617a92cde37b3607e7ecb4 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 15 Apr 2020 16:35:40 +0200
Subject: [PATCH] validation, iec: Rework common parameters list

Instead of abusing yaml anchors, use jjb inheritance of parameter
lists.

While at it, fix IEC Compass default value of private key, which
should be empty (Compass uses user/pass auth).

Change-Id: I5528b6ce4dcf648ec416194bfcbb88bddc1c8c39
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 jjb/akraino-templates/akraino-iec-macros.yaml      |  1 +
 .../akraino-validation-macros.yaml                 | 57 ++++++++--------------
 2 files changed, 22 insertions(+), 36 deletions(-)

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 c484efd..3c736e3 100644
--- a/jjb/akraino-templates/akraino-validation-macros.yaml
+++ b/jjb/akraino-templates/akraino-validation-macros.yaml
@@ -33,66 +33,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 #
-- 
2.16.6