X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-golang.yaml;h=ba2f74e2e077b5dd63416c0613ff822aecb1703b;hb=f39b3498d24302506a4eae32565b10248d9a3d6c;hp=b497c8b6879b283409245050c232ff47579df015;hpb=9655e0f67a0be8470595dab67ba5f304b203e7db;p=ci-management.git

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}'