From df6e71f1a329ddf3a48160e20b2234c84bb22a0d Mon Sep 17 00:00:00 2001
From: Kiran Kamineni <kiran.k.kamineni@intel.com>
Date: Wed, 24 Oct 2018 12:16:13 -0700
Subject: [PATCH] Add golangver allowing projects to pick go version

Adding a new golangver variable that is by default set to
golang110. Projects do not need to do anything for this.
Any project that wants to move to 1.11 just needs to set
this variable to golang111

Issue-ID: CIMAN-216
Change-Id: Ia5a5a7dfbc94549726ed97ebc63e5562c19db513
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
---
 jjb/global-templates-golang.yaml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index b497c8b68..ba2f74e2e 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -5,11 +5,16 @@
     # The purpose of this job template is to run:
     # 1. make build
     #
+    # golangver can be set to golang110 or golang111
+    # depending on what version is needed by the project
+    # default is golang110
+    #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
     name: '{project-name}-{stream}-verify-golang'
     path: '$WORKSPACE'
+    golangver: 'golang110'
 
     project-type: freestyle
     concurrent: true
@@ -33,7 +38,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang110
+      - '{golangver}'
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
@@ -64,11 +69,16 @@
     # The purpose of this job template is to run:
     # 1. make deploy
     #
+    # golangver can be set to golang110 or golang111
+    # depending on what version is needed by the project
+    # default is golang110
+    #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
     name: '{project-name}-{stream}-merge-golang'
     path: $WORKSPACE
+    golangver: 'golang110'
 
     project-type: freestyle
     node: '{build-node}'
@@ -93,7 +103,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang110
+      - '{golangver}'
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
@@ -121,12 +131,17 @@
 - job-template:
     # Job template for building & pushing docker images
     #
+    # golangver can be set to golang110 or golang111
+    # depending on what version is needed by the project
+    # default is golang110
+    #
     # The purpose of this job template is to run:
     #  1. login to the docker registry
     #  2. run a specified shell builder
     #
 
     name: '{project-name}-{stream}-docker-golang-shell-daily'
+    golangver: 'golang110'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
     disabled: false
@@ -148,7 +163,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang110
+      - '{golangver}'
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
-- 
2.16.6