From 7681762285f0caa49a6b54f817ae825dacf307f8 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 13 Jul 2016 14:03:49 +0200
Subject: sandbox: Pass predefined parameters to verify phase jobs

Change-Id: I6ac1d203123c6ea492b5c796e8312f38f64f57ae
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/sandbox/sandbox-verify-jobs-multijob.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'jjb')

diff --git a/jjb/sandbox/sandbox-verify-jobs-multijob.yml b/jjb/sandbox/sandbox-verify-jobs-multijob.yml
index 1e6a42236..7f7babb6d 100644
--- a/jjb/sandbox/sandbox-verify-jobs-multijob.yml
+++ b/jjb/sandbox/sandbox-verify-jobs-multijob.yml
@@ -17,9 +17,9 @@
             gs-pathname: '/{stream}'
             disabled: true
 #####################################
-# patch verification activities
+# patch verification phases
 #####################################
-    activity:
+    phase:
         - 'basic':
             slave-label: 'opnfv-build-ubuntu'
         - 'build':
@@ -33,7 +33,7 @@
 #####################################
     jobs:
         - 'sandbox-verify-{stream}-multijob'
-        - 'sandbox-verify-{activity}-{stream}-multijob'
+        - 'sandbox-verify-{phase}-{stream}-multijob'
 #####################################
 # job templates
 #####################################
@@ -112,6 +112,7 @@
             projects:
                 - name: 'sandbox-verify-build-{stream}-multijob'
                   current-parameters: false
+                  predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -124,6 +125,7 @@
             projects:
                 - name: 'sandbox-verify-deploy-{stream}-multijob'
                   current-parameters: false
+                  predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -136,6 +138,7 @@
             projects:
                 - name: 'sandbox-verify-test-{stream}-multijob'
                   current-parameters: false
+                  predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -144,7 +147,7 @@
                   abort-all-job: true
 
 - job-template:
-    name: 'sandbox-verify-{activity}-{stream}-multijob'
+    name: 'sandbox-verify-{phase}-{stream}-multijob'
 
     disabled: '{obj:disabled}'
 
@@ -183,7 +186,7 @@
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
-        - '{project}-verify-{activity}-builder'
+        - '{project}-verify-{phase}-builder'
 #####################################
 # builder macros
 #####################################
-- 
cgit 1.2.3-korg