Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintenance/955-maintenance-for-golang-agent-and-quickstarter #958

Merged
merged 4 commits into from
Oct 19, 2023
Merged

Maintenance/955-maintenance-for-golang-agent-and-quickstarter #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cde1355
Update GO_DISTRIBUTION_URL
serverhorror Oct 11, 2023
6717dd3
Update golangci version
serverhorror Oct 11, 2023
b7c3e4c
Update docs
serverhorror Oct 11, 2023
d6ad786
Update CHANGELOG.md
serverhorror Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
5 changes: 3 additions & 2 deletions common/jenkins-agents/golang/docker/Dockerfile.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ FROM opendevstackorg/ods-jenkins-agent-base-ubi8:latest

LABEL maintainer="Michael Sauter <[email protected]>"

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++

Expand All @@ -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/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion common/jenkins-agents/golang/ocp-config/bc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/modules/jenkins-agents/pages/golang.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.