diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2022-08-02 09:02:05 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2022-08-02 09:02:05 +0300 |
| commit | 867b74cdceabbcbf65eb75025b4f3a10de9a4c55 (patch) | |
| tree | aa96e2d53798f8519f5283eeeed3046fb0431968 | |
| parent | 34c40a7db292eb711b3f3216c3e696aefdcd7dbe (diff) | |
| parent | 6d37df842bde9784dec0ceda5bf7a194481b92af (diff) | |
Merge branch 'use-ubi-image' into 'master'
Use custom image for FIPS jobs
See merge request gitlab-org/gitaly!4687
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | internal/gitaly/service/ssh/receive_pack_test.go | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd28fb2a0..30485d951 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ variables: SAST_DISABLE_DIND: "true" SAST_DEFAULT_ANALYZERS: "gosec" DEBIAN_VERSION: "bullseye" + UBI_VERSION: "8.6" # We use Gitaly's Git version by default. GIT_VERSION: "default" GO_VERSION: "1.18" @@ -268,12 +269,9 @@ test:fips: <<: *test_definition tags: - fips - image: registry.access.redhat.com/ubi8/ubi:8.5 + image: registry.gitlab.com/gitlab-org/gitlab-build-images/ubi-${UBI_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}:git-2.36 before_script: - test "$(cat /proc/sys/crypto/fips_enabled)" = "1" || (echo "System is not running in FIPS mode" && exit 1) - - dnf module enable -y ruby:2.7 - - dnf install -y bzip2 cmake gcc-c++ git go-toolset libcurl-devel libicu-devel make openssl procps-ng redhat-rpm-config ruby-devel rubygems - - gem install bundler:2.3.15 - *test_before_script parallel: matrix: diff --git a/internal/gitaly/service/ssh/receive_pack_test.go b/internal/gitaly/service/ssh/receive_pack_test.go index 497383425..69eaed0d7 100644 --- a/internal/gitaly/service/ssh/receive_pack_test.go +++ b/internal/gitaly/service/ssh/receive_pack_test.go @@ -780,12 +780,12 @@ func sshPushCommand(ctx context.Context, t *testing.T, cfg config.Cfg, cloneDeta } cmd := gittest.NewCommand(t, cfg, "-C", cloneDetails.LocalRepoPath, "push", "-v", "git@localhost:test/test.git", "master") - cmd.Env = []string{ + cmd.Env = append(cmd.Env, fmt.Sprintf("GITALY_PAYLOAD=%s", payload), fmt.Sprintf("GITALY_ADDRESS=%s", serverSocketPath), fmt.Sprintf("GITALY_FEATUREFLAGS=%s", strings.Join(flagsWithValues, ",")), fmt.Sprintf("GIT_SSH_COMMAND=%s receive-pack", cfg.BinaryPath("gitaly-ssh")), - } + ) return cmd } |