Merge "Adding support to use golang jenkins plugin"

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index cf34094..6be0e0f 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -428,6 +428,15 @@
           timeout: 360
           fail: true
 
+- wrapper:
+    name: golang
+    wrappers:
+      - raw:
+          xml: |
+            <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2">
+            <goVersion>Golang 1.10</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 168fb62..1558c65 100644 (file)
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -33,6 +33,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
+      - golang
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
@@ -49,10 +50,6 @@
           settings-file: '{mvn-settings}'
       - shell: |
           #!/bin/bash
-          curl -O https://dl.google.com/go/go1.10.linux-amd64.tar.gz
-          tar -zxf go1.10.linux-amd64.tar.gz
-          export GOROOT=$WORKSPACE/go
-          export PATH=$PATH:$GOROOT/bin
           cd $WORKSPACE/{path}
           make build
 
@@ -95,6 +92,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
+      - golang
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
@@ -111,10 +109,6 @@
           settings-file: '{mvn-settings}'
       - shell: |
           #!/bin/bash
-          curl -O https://dl.google.com/go/go1.10.linux-amd64.tar.gz
-          tar -zxf go1.10.linux-amd64.tar.gz
-          export GOROOT=$PWD/go
-          export PATH=$PATH:$GOROOT/bin
           cd $WORKSPACE/{path}
           make deploy
 
@@ -152,6 +146,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
+      - golang
       - infra-wrappers:
           build-timeout: '{build-timeout}'