Merge "validation, iec: Rework common parameters list"

diff --combined jjb/akraino-templates/akraino-validation-macros.yaml
index 471d2b9,3c736e3..6bdcdce
--- 1/jjb/akraino-templates/akraino-validation-macros.yaml
--- 2/jjb/akraino-templates/akraino-validation-macros.yaml
+++ b/jjb/akraino-templates/akraino-validation-macros.yaml
@@@ -1,70 -1,83 +1,55 @@@
  ---
 -#######
 -# SCM #
 -#######
 -- scm:
 -    # Enhanced version of the global-jjb
 -    name: validation-infra-gerrit-scm
 -    scm:
 -      - git:
 -          credentials-id: '{jenkins-ssh-credential}'
 -          url: '{git-url}'
 -          refspec: '{refspec}'
 -          branches:
 -            - 'refs/{refs_tag}/{stream}'
 -          skip-tag: false
 -          wipe-workspace: true
 -          submodule:
 -            recursive: '{submodule-recursive}'
 -            timeout: '{submodule-timeout}'
 -          choosing-strategy: '{choosing-strategy}'
 -
  ##############
  # PARAMETERS #
  ##############
 -- parameter:
 -    name: validation-job-parameters
 -    parameters:
 -      - lf-infra-parameters:
 -          project: '{project}'
 -          stream: '{stream}'
 -          branch: '{branch}'
 -
  - 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 #
@@@ -72,8 -85,10 +57,8 @@@
  # settings for jobs run in multijob phases
  - docker-build-job-settings: &docker-build-job-settings
      name: docker_build_job_settings
 -    current-parameters: false
 -    git-revision: true
 +    current-parameters: true
 +    git-revision: false
      node-parameters: false
 -    predefined-parameters: |
 -      GERRIT_REFNAME=$GERRIT_REFNAME
      kill-phase-on: FAILURE
      abort-all-jobs: false