From cde13552eb7a4b5ed4c776b205960cf365c4eac3 Mon Sep 17 00:00:00 2001 From: Martin Marcher Date: Wed, 11 Oct 2023 13:47:26 +0000 Subject: [PATCH 1/4] Update GO_DISTRIBUTION_URL fixes #955 Maintenance for Golang Agent and Quickstarter --- common/jenkins-agents/golang/ocp-config/bc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/jenkins-agents/golang/ocp-config/bc.yml b/common/jenkins-agents/golang/ocp-config/bc.yml index c72895285..8d3abe7a9 100644 --- a/common/jenkins-agents/golang/ocp-config/bc.yml +++ b/common/jenkins-agents/golang/ocp-config/bc.yml @@ -17,7 +17,7 @@ parameters: value: Dockerfile.ubi8 description: Dockerfile variant to use - name: GO_DISTRIBUTION_URL - value: https://go.dev/dl/go1.20.4.linux-amd64.tar.gz + value: https://go.dev/dl/go1.21.3.linux-amd64.tar.gz description: URL pointing to go binary objects: - apiVersion: v1 From 6717dd3fa6c5d6ba21895810d520b9d8ec29fd48 Mon Sep 17 00:00:00 2001 From: Martin Marcher Date: Wed, 11 Oct 2023 13:52:42 +0000 Subject: [PATCH 2/4] Update golangci version also: * extract version number to ARG * provide default values for more convinient local builds fixes #955 Maintenance for Golang Agent and Quickstarter --- common/jenkins-agents/golang/docker/Dockerfile.ubi8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/jenkins-agents/golang/docker/Dockerfile.ubi8 b/common/jenkins-agents/golang/docker/Dockerfile.ubi8 index ddce90457..2745e46bd 100644 --- a/common/jenkins-agents/golang/docker/Dockerfile.ubi8 +++ b/common/jenkins-agents/golang/docker/Dockerfile.ubi8 @@ -2,7 +2,8 @@ FROM opendevstackorg/ods-jenkins-agent-base-ubi8:latest LABEL maintainer="Michael Sauter " -ARG goDistributionUrl +ARG goDistributionUrl=https://go.dev/dl/go1.21.3.linux-amd64.tar.gz +ARG golangciVersion=v1.54.2 RUN yum install -y gcc gcc-c++ @@ -18,7 +19,7 @@ ENV PATH $PATH:/usr/local/go/bin ENV GOBIN /usr/local/bin COPY install-golangci-lint.sh /tmp/install-golangci-lint.sh -RUN /tmp/install-golangci-lint.sh -b /usr/local/bin v1.52.2 && \ +RUN /tmp/install-golangci-lint.sh -b /usr/local/bin $golangciVersion && \ rm -f /tmp/install-golangci-lint.sh RUN go install github.com/jstemmer/go-junit-report/v2@v2.0.0 From b7c3e4c9ebbe02b0d4996075b08cc2d420faf611 Mon Sep 17 00:00:00 2001 From: Martin Marcher Date: Wed, 11 Oct 2023 13:55:54 +0000 Subject: [PATCH 3/4] Update docs fixes #955 Maintenance for Golang Agent and Quickstarter --- docs/modules/jenkins-agents/pages/golang.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/jenkins-agents/pages/golang.adoc b/docs/modules/jenkins-agents/pages/golang.adoc index e948996ee..78988f3e8 100644 --- a/docs/modules/jenkins-agents/pages/golang.adoc +++ b/docs/modules/jenkins-agents/pages/golang.adoc @@ -7,8 +7,8 @@ The image is built in the global `ods` project and is named `jenkins-agent-golan It can be referenced in a `Jenkinsfile` with e.g. `ods/jenkins-agent-golang:latest`. == Features -1. Go 1.20.x -2. golangci-lint 1.52.x +1. Go 1.21.x +2. golangci-lint 1.54.x == Known limitations Not (yet) Nexus package manager aware and no special HTTP Proxy configuration. From d6ad786fecdad0015e2cd71dbf7b8d85c4b343b5 Mon Sep 17 00:00:00 2001 From: Martin Marcher Date: Wed, 18 Oct 2023 15:26:14 +0000 Subject: [PATCH 4/4] Update CHANGELOG.md fixes #955 Maintenance for Golang Agent and Quickstarter --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5bc6a72f..7ed48f1d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Modified ### Fixed +- Maintenance for Golang Agent and QuickStarter ([#955](https://github.com/opendevstack/ods-quickstarters/issues/955)) - jenkins agents can not import private keys into gpg keyring to use with helm secrets ([#945](https://github.com/opendevstack/ods-quickstarters/issues/945)) - Streamlit quickstarter build fails to import nexus host certificates into truststore ([#951](https://github.com/opendevstack/ods-quickstarters/issues/951))