Golang agent update (#1045)

opendevstack · Aug 28, 2024 · 3e1adef · 3e1adef
1 parent 59fb002
commit 3e1adef
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -14,7 +14,8 @@ jobs:
         working-directory: common/jenkins-agents/golang/docker
         run: |
           docker build --tag agent-go-test-ubi8 --file Dockerfile.ubi8 \
-            --build-arg goDistributionUrl=https://go.dev/dl/go1.20.4.linux-amd64.tar.gz \
+            --build-arg goDistributionUrl=https://go.dev/dl/go1.23.0.linux-amd64.tar.gz \
+            --build-arg golangciVersion=v1.60.1 \
             .
 
   jenkins-agent-jdk-ubi8:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Update Rust Axum Quickstarter to Rust 1.79.0 ([#1024](https://github.com/opendevstack/ods-quickstarters/pull/1024))
 - Gitleaks docs fix and update ([#1028](https://github.com/opendevstack/ods-quickstarters/issues/1028))
 - Enable OpenSSL vendored compilation for Rust Jenkins Agent ([#1026](https://github.com/opendevstack/ods-quickstarters/pull/1026))
+- Update Golang agent ([#1031](https://github.com/opendevstack/ods-quickstarters/issues/1031))
 - Update gateway/nginx Quickstarter ([#1048](https://github.com/opendevstack/ods-quickstarters/pull/1048))
 - Update Rust Axum Quickstarter to Rust 1.80.1 and improve Agent build configuration ([#1040](https://github.com/opendevstack/ods-quickstarters/pull/1040))
 - Support for Python3.12, and maintenance of be-python-flask quickstarter and python Jenkins agent ([#1030](https://github.com/opendevstack/ods-quickstarters/pull/1030))

diff --git a/common/jenkins-agents/golang/docker/Dockerfile.ubi8 b/common/jenkins-agents/golang/docker/Dockerfile.ubi8
@@ -1,7 +1,7 @@
 FROM opendevstackorg/ods-jenkins-agent-base-ubi8:latest
 
-ARG goDistributionUrl=https://go.dev/dl/go1.21.3.linux-amd64.tar.gz
-ARG golangciVersion=v1.54.2
+ARG goDistributionUrl
+ARG golangciVersion
 
 RUN yum install -y gcc gcc-c++
 
@@ -20,7 +20,7 @@ COPY install-golangci-lint.sh /tmp/install-golangci-lint.sh
 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
+RUN go install github.com/jstemmer/go-junit-report/v2@v2.1.0
 
 RUN mkdir -p /home/jenkins/go && chmod g+w /home/jenkins/go
 

diff --git a/common/jenkins-agents/golang/ocp-config/bc.yml b/common/jenkins-agents/golang/ocp-config/bc.yml
@@ -17,8 +17,11 @@ parameters:
   value: Dockerfile.ubi8
   description: Dockerfile variant to use
 - name: GO_DISTRIBUTION_URL
-  value: https://go.dev/dl/go1.21.3.linux-amd64.tar.gz
+  value: https://go.dev/dl/go1.23.0.linux-amd64.tar.gz
   description: URL pointing to go binary
+- name: GOLANG_CI_VERSION
+  value: v1.60.1
+  description: version of go linter runner
 objects:
 - apiVersion: build.openshift.io/v1
   kind: BuildConfig
@@ -59,5 +62,7 @@ objects:
         buildArgs:
           - name: goDistributionUrl
             value: ${GO_DISTRIBUTION_URL}
+          - name: golangciVersion
+            value: ${GOLANG_CI_VERSION}
       type: Docker
     successfulBuildsHistoryLimit: 5
diff --git 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.21.x
-2. golangci-lint 1.54.x
+1. Go 1.23.0
+2. golangci-lint 1.60.1
 
 == Known limitations
 Not (yet) Nexus package manager aware and no special HTTP Proxy configuration.