summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKiran Kamineni <kiran.k.kamineni@intel.com>2018-10-23 16:53:34 -0700
committerKiran Kamineni <kiran.k.kamineni@intel.com>2018-10-23 16:53:37 -0700
commit9655e0f67a0be8470595dab67ba5f304b203e7db (patch)
treeee9798a17c9171aa98a5c020ce55b833181ea353
parent584add827782fbf4e60d26fd262d3b4ad2f5c8a7 (diff)
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>
-rw-r--r--jjb/global-macros.yaml11
-rw-r--r--jjb/global-templates-golang.yaml6
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: |
@@ -478,6 +478,15 @@
</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.
name: infra-wrappers
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}'