summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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}'