Skip to content

Commit c370b78

Browse files
author
Igor Drozdov
committed
Use the images provided by Gitlab to run tests
That would save us from installing additional dependencies ourselves
1 parent 9d97161 commit c370b78

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ include:
1010
variables:
1111
DOCKER_VERSION: "20.10.15"
1212
BUNDLE_FROZEN: "true"
13+
GO_VERSION: "1.18"
14+
DEBIAN_VERSION: "bullseye"
15+
RUBY_VERSION: "2.7"
1316

1417
workflow:
1518
rules: &workflow_rules
@@ -21,7 +24,7 @@ workflow:
2124
- if: '$CI_COMMIT_TAG'
2225

2326
default:
24-
image: golang:1.14
27+
image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}:git-2.36
2528
tags:
2629
- gitlab-org
2730

@@ -38,12 +41,7 @@ default:
3841
GITALY_CONNECTION_INFO: '{"address":"tcp://gitaly:8075", "storage":"default"}'
3942
before_script:
4043
# Set up the environment to run integration tests (still written in Ruby)
41-
- apt-get update -qq && apt-get install -y ruby ruby-dev
42-
- ruby -v
43-
- export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin
44-
- gem install --force --bindir /usr/local/bin bundler -v 2.3.6
4544
- bundle install
46-
# Now set up to run the Golang tests
4745
- make build
4846
- cp config.yml.example config.yml
4947
- go version
@@ -58,7 +56,6 @@ default:
5856

5957
tests:
6058
extends: .test
61-
image: golang:${GO_VERSION}
6259
parallel:
6360
matrix:
6461
- GO_VERSION: ["1.17", "1.18", "1.19"]
@@ -68,7 +65,6 @@ tests:
6865

6966
race:
7067
extends: .test
71-
image: golang:1.18
7268
script:
7369
- make test_golang_race
7470

0 commit comments

Comments
 (0)