Merge "Use Go 1.14 for multicloud-k8s CI build"

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 9c70eec..4702696 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -495,6 +495,15 @@
             <goVersion>Golang 1.12</goVersion>
             </org.jenkinsci.plugins.golang.GolangBuildWrapper>
 
+- wrapper:
+    name: golang114
+    wrappers:
+      - raw:
+          xml: |
+            <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.4">
+            <goVersion>Golang 1.14</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/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 5bb4eeb..dd43c95 100644 (file)
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -3,7 +3,7 @@
     name: multicloud-k8s
     project-name: 'multicloud-k8s'
     path: 'src'
-    golangver: 'golang112'
+    golangver: 'golang114'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-golang'
@@ -35,7 +35,7 @@
 #    name: multicloud-k8s-arm64
 #    project-name: 'multicloud-k8s-arm64'
 #    path: 'src/k8splugin'
-#    golangver: 'golang112'
+#    golangver: 'golang114'
 #    jobs:
 #      - '{project-name}-{stream}-docker-golang-shell-daily':
 #          script: