diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2022-11-24 12:03:54 +0100 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2022-11-24 12:07:04 +0100 |
| commit | 27e52681c5e7e97505f913497e34e8e176ffc5c9 (patch) | |
| tree | 2e2cf526f439a47dfa0106729da03ef7fb8199c0 | |
| parent | e50d6d0b6206e37fb5e0d19eae4a3688ddb28ba2 (diff) | |
| download | gitlab-shell-tmp-kerberos-testing.tar.gz | |
Try using Gitlab provided image insteadtmp-kerberos-testing
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 993bde3..d2892de 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 @@ -37,13 +40,7 @@ default: variables: 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 libkrb5-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 +55,6 @@ default: tests: extends: .test - image: golang:${GO_VERSION} parallel: matrix: - GO_VERSION: ["1.17", "1.18", "1.19"] @@ -68,7 +64,6 @@ tests: race: extends: .test - image: golang:1.18 script: - make test_golang_race @@ -80,7 +75,6 @@ code_navigation: image: sourcegraph/lsif-go:v1.9 allow_failure: true script: - - apt-get update -qq && apt-get install -y libkrb5-dev - lsif-go artifacts: reports: |