Skip to content

Commit 67db1b4

Browse files
twk3Clemens Beck
andcommitted
Merge branch 'update-go-1-20' into 'master'
Update builder Go version See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7090 Merged-by: DJ Mountney <[email protected]> Approved-by: Andrew Patterson <[email protected]> Approved-by: DJ Mountney <[email protected]> Co-authored-by: Clemens Beck <[email protected]>
2 parents 32c724f + 5bf8e05 commit 67db1b4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ variables:
4242
# To be used for images that exist only on dev.gitlab.org
4343
DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder'
4444
PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
45-
BUILDER_IMAGE_REVISION: "4.20.0"
45+
BUILDER_IMAGE_REVISION: "4.21.1"
4646
# The registry to pull the assets image from
4747
ASSET_REGISTRY: "${CI_REGISTRY}"
4848
ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"

test-plans/upgrade-golang-testplan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<!-- Copy and paste the following into your MR description. -->
44
## Test plan
55

6-
- [ ] QA tests passed for FIPS and non FIPS builds
7-
- [ ] Confirmed build was done with go 1.19 `strings /opt/gitlab/embedded/bin/gitaly | grep 'go1\.' | tail -1`
6+
- [ ] QA tests passed for FIPS and non FIPS builds, including triggering the `build-package-on-all-os` job
7+
- [ ] Confirmed build was done with desired version of go `strings /opt/gitlab/embedded/bin/gitaly | grep 'go1\.' | tail -1`
88
- [ ] Confirmed Omnibus-built services that are owned by distribution are working
99
- [ ] prometheus - (is scraping metrics)
1010

0 commit comments

Comments
 (0)