X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-validation-macros.yaml;h=ed2d9b17e05b878ceaeede75ae54e699ac93608c;hb=HEAD;hp=c484efd2d31bb638c61e9961b60ac38eb8201885;hpb=ecd7ed34ed2a547d8d64dddae12c1087754f7981;p=ci-management.git

diff --git a/jjb/akraino-templates/akraino-validation-macros.yaml b/jjb/akraino-templates/akraino-validation-macros.yaml
index c484efd..ed2d9b1 100644
--- a/jjb/akraino-templates/akraino-validation-macros.yaml
+++ b/jjb/akraino-templates/akraino-validation-macros.yaml
@@ -1,109 +1,56 @@
 ---
-#######
-# 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
-          name: CLUSTER_MASTER_IP
-          default: ''
-          description: 'IP address to connect to the cluster master'
-      - string: &cluster_ssh_user
-          name: CLUSTER_SSH_USER
-          default: ''
-          description: 'SSH username to connect to the cluster master '
-      - string: &cluster_ssh_password
-          name: CLUSTER_SSH_PASSWORD
-          default: ''
-          description: 'SSH password to connect to the cluster master'
-      - string: &cluster_ssh_key
-          name: CLUSTER_SSH_KEY
-          default: ''
-          description: 'SSH key to connect to the cluster master'
-      - string: &blueprint_name
-          name: BLUEPRINT
-          default: ''
-          description: 'Blueprint used'
-      - string: &layer
-          name: LAYER
-          default: ''
-          description: 'Layer'
-      - string: &version
-          name: VERSION
-          default: ''
-          description: 'Version'
-      - string: &optional
-          name: OPTIONAL
-          default: ''
-          description: 'If set to yes run optional tests'
+      - lab_params
       - string:
           name: LAB_SILO
-          default: ''
-          description: 'Folder in nexus where the logs are pushed.'
+          default: ""
+          description: "Folder in nexus where the logs are pushed."
       - string:
           name: SETTINGS_FILE
-          default: '/home/jenkins/settings.xml'
-          description: 'Path to credentials file'
+          default: "/home/jenkins/settings.xml"
+          description: "Path to credentials file"
 
 - parameter:
     name: lab_params
     parameters:
       - string:
-          <<: *cluster_master_ip
+          name: CLUSTER_MASTER_IP
+          default: ""
+          description: "IP address to connect to the cluster master"
       - string:
-          <<: *cluster_ssh_user
+          name: CLUSTER_SSH_USER
+          default: ""
+          description: "SSH username to connect to the cluster master "
       - string:
-          <<: *cluster_ssh_password
+          name: CLUSTER_SSH_PASSWORD
+          default: ""
+          description: "SSH password to connect to the cluster master"
       - string:
-          <<: *cluster_ssh_key
+          name: CLUSTER_SSH_KEY
+          default: ""
+          description: "SSH key to connect to the cluster master"
       - string:
-          <<: *blueprint_name
+          name: BLUEPRINT
+          default: ""
+          description: "Blueprint used"
       - string:
-          <<: *layer
+          name: LAYER
+          default: ""
+          description: "Layer"
       - string:
-          <<: *version
+          name: VERSION
+          default: ""
+          description: "Version"
       - string:
-          <<: *optional
-
-############
-# SETTINGS #
-############
-# 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
-    node-parameters: false
-    predefined-parameters: |
-      GERRIT_REFNAME=$GERRIT_REFNAME
-    kill-phase-on: FAILURE
-    abort-all-jobs: false
+          name: OPTIONAL
+          default: ""
+          description: "If set to yes run optional tests"
+      - string:
+          name: PULL
+          default: "false"
+          description: "If set to yes pull docker images before run"