From 9655e0f67a0be8470595dab67ba5f304b203e7db Mon Sep 17 00:00:00 2001
From: Kiran Kamineni <kiran.k.kamineni@intel.com>
Date: Tue, 23 Oct 2018 16:53:34 -0700
Subject: [PATCH] Add golang 1.11 wrapper

Add support for golang 1.11
renamed old golang to golang110

Issue-ID: CIMAN-216
Change-Id: I771f8291b376d4406fd530bf97bb882171f1c936
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
---
 jjb/global-macros.yaml           | 11 ++++++++++-
 jjb/global-templates-golang.yaml |  6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index d32e53d7b..b7a56afb1 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -469,7 +469,7 @@
           fail: true
 
 - wrapper:
-    name: golang
+    name: golang110
     wrappers:
       - raw:
           xml: |
@@ -477,6 +477,15 @@
             <goVersion>Golang 1.10</goVersion>
             </org.jenkinsci.plugins.golang.GolangBuildWrapper>
 
+- wrapper:
+    name: golang111
+    wrappers:
+      - raw:
+          xml: |
+            <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2">
+            <goVersion>Golang 1.11</goVersion>
+            </org.jenkinsci.plugins.golang.GolangBuildWrapper>
+
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the eCOMP infra.
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index e891e92df..b497c8b68 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -33,7 +33,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang
+      - golang110
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
@@ -93,7 +93,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang
+      - golang110
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
@@ -148,7 +148,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang
+      - golang110
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
-- 
2.16.6