From 85b44e87880d483e9b7106f3031a47d0be5b8800 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Wed, 21 Mar 2018 11:14:29 -0700 Subject: Adding support to use golang jenkins plugin Jenkins server has the golang plugin installed for version 1.10. Modifying the template to use that so that future template definitions do not need to download golang each time. This reduces total build time and network bandwidth usage. Issue-ID: AAF-184 Change-Id: Ib91f4fb8aa8845bd20d98ba636dffcadf34da297 Signed-off-by: Kiran Kamineni --- jjb/global-macros.yaml | 9 +++++++++ jjb/global-templates-golang.yaml | 11 +++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index cf3409434..6be0e0f94 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -428,6 +428,15 @@ timeout: 360 fail: true +- wrapper: + name: golang + wrappers: + - raw: + xml: | + + Golang 1.10 + + - 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 168fb6203..1558c65f3 100644 --- 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}' -- cgit 1.2.3-korg