diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2022-11-28 00:33:08 +0000 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2022-11-28 00:33:08 +0000 |
| commit | 75f184619640e1cd2fc820091064644df9b05279 (patch) | |
| tree | 5a1eebd00ac991b73e03ec676b708f8ce6a267ab | |
| parent | 9d97161d4e5dc155f0760d019d92257ed38e7546 (diff) | |
| parent | c370b78222a998ca0bef2f045f8b1219012331d6 (diff) | |
| download | gitlab-shell-75f184619640e1cd2fc820091064644df9b05279.tar.gz | |
Merge branch 'id-using-gitlab-build-images' into 'main'
Use the images provided by Gitlab to run tests
See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/698
Merged-by: Patrick Bajao <ebajao@gitlab.com>
Approved-by: Patrick Bajao <ebajao@gitlab.com>
Co-authored-by: Igor Drozdov <idrozdov@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d0e596..de0975c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,9 @@ include: variables: DOCKER_VERSION: "20.10.15" BUNDLE_FROZEN: "true" + GO_VERSION: "1.18" + DEBIAN_VERSION: "bullseye" + RUBY_VERSION: "2.7" workflow: rules: &workflow_rules @@ -21,7 +24,7 @@ workflow: - if: '$CI_COMMIT_TAG' default: - image: golang:1.14 + image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}:git-2.36 tags: - gitlab-org @@ -38,12 +41,7 @@ default: GITALY_CONNECTION_INFO: '{"address":"tcp://gitaly:8075", "storage":"default"}' before_script: # Set up the environment to run integration tests (still written in Ruby) - - apt-get update -qq && apt-get install -y ruby ruby-dev - - ruby -v - - export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin - - gem install --force --bindir /usr/local/bin bundler -v 2.3.6 - bundle install - # Now set up to run the Golang tests - make build - cp config.yml.example config.yml - go version @@ -58,7 +56,6 @@ default: tests: extends: .test - image: golang:${GO_VERSION} parallel: matrix: - GO_VERSION: ["1.17", "1.18", "1.19"] @@ -68,7 +65,6 @@ tests: race: extends: .test - image: golang:1.18 script: - make test_golang_race |