diff --git a/.jenkins.yml b/.jenkins.yml index e41a8a5e9..501cc7b8c 100644 --- a/.jenkins.yml +++ b/.jenkins.yml @@ -6,3 +6,4 @@ GO_VERSION: - "1.10.x" - "1.11.x" - "1.12.x" + - "1.13.x" diff --git a/Jenkinsfile b/Jenkinsfile index 1fae81fcc..c8bb2a2d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ pipeline { issueCommentTrigger('(?i).*(?:jenkins\\W+)?run\\W+(?:the\\W+)?tests(?:\\W+please)?.*') } parameters { - string(name: 'GO_VERSION', defaultValue: "1.12.7", description: "Go version to use.") + string(name: 'GO_VERSION', defaultValue: "1.14.2", description: "Go version to use.") booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.') booleanParam(name: 'test_ci', defaultValue: true, description: 'Enable test') booleanParam(name: 'docker_test_ci', defaultValue: true, description: 'Enable run docker tests') diff --git a/internal/tracecontexttest/Dockerfile b/internal/tracecontexttest/Dockerfile index 51b7b13dc..a6f894596 100644 --- a/internal/tracecontexttest/Dockerfile +++ b/internal/tracecontexttest/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13 +FROM golang:latest ADD . /go/src/go.elastic.co/apm ENV GO111MODULE=on ENV GOPROXY=https://proxy.golang.org diff --git a/scripts/Dockerfile-testing b/scripts/Dockerfile-testing index ecaf6399c..1c61644a4 100644 --- a/scripts/Dockerfile-testing +++ b/scripts/Dockerfile-testing @@ -1,5 +1,5 @@ # Code generated by gendockerfile. DO NOT EDIT. -FROM golang:1.13 +FROM golang:latest ENV GO111MODULE=on COPY go.mod go.sum /go/src/go.elastic.co/apm/ diff --git a/scripts/gendockerfile.go b/scripts/gendockerfile.go index 33d4d82c0..47a0bab9b 100644 --- a/scripts/gendockerfile.go +++ b/scripts/gendockerfile.go @@ -59,7 +59,7 @@ var dockerfileTemplateFuncs = template.FuncMap{ // copying across the rest of the source code. var dockerfileTemplate = template.Must(template.New("Dockerfile").Funcs(dockerfileTemplateFuncs).Parse(` # Code generated by gendockerfile. DO NOT EDIT. -FROM golang:1.13 +FROM golang:latest ENV GO111MODULE=on {{range .Dirs}} COPY {{join . "go.mod"}} {{join . "go.sum"}} {{join "/go/src/go.elastic.co/apm" .}}/{{end}}