diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-21 22:37:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-21 22:37:49 +0200 |
| commit | 34b2018cfc75772e89367614852c382ac47d3ec1 (patch) | |
| tree | d909577ebd6ba02a1007e92ba49be525c5e05582 /contrib | |
| parent | 5f53a67742d6151fee3f62f4d82226da6246b461 (diff) | |
| parent | bc6a48eebb1e8647f0d26206ee11e544e026eb76 (diff) | |
| download | podman-34b2018cfc75772e89367614852c382ac47d3ec1.tar.gz podman-34b2018cfc75772e89367614852c382ac47d3ec1.tar.bz2 podman-34b2018cfc75772e89367614852c382ac47d3ec1.zip | |
Merge pull request #15030 from cevich/gitlab_comment
[CI:DOCS] Cirrus: Add prominent gitlab warning
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/runner.sh | 3 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 23 |
2 files changed, 23 insertions, 3 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 32f66bac2..939cc33ce 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -334,6 +334,9 @@ function _run_release() { } +# ***WARNING*** ***WARNING*** ***WARNING*** ***WARNING*** +# Please see gitlab comment in setup_environment.sh +# ***WARNING*** ***WARNING*** ***WARNING*** ***WARNING*** function _run_gitlab() { rootless_uid=$(id -u) systemctl enable --now --user podman.socket diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 4952f8dd2..d5044816d 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -321,13 +321,30 @@ case "$TEST_FLAVOR" in install_test_configs ;; gitlab) - # This only runs on Ubuntu for now + # ***WARNING*** ***WARNING*** ***WARNING*** ***WARNING*** + # This sets up a special ubuntu environment exclusively for + # running the upstream gitlab-runner unit tests through + # podman as a drop-in replacement for the Docker daemon. + # Test and setup information can be found here: + # https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27270#note_499585550 + # + # Unless you know what you're doing, and/or are in contact + # with the upstream gitlab-runner developers/community, + # please don't make changes willy-nilly to this setup. + # It's designed to follow upstream gitlab-runner development + # and alert us if any podman change breaks their foundation. + # + # That said, if this task does break in strange ways or requires + # updates you're unsure of. Please consult with the upstream + # community through an issue near the one linked above. If + # an extended period of breakage is expected, please un-comment + # the related `allow_failures: $CI == $CI` line in `.cirrus.yml`. + # ***WARNING*** ***WARNING*** ***WARNING*** ***WARNING*** + if [[ "$OS_RELEASE_ID" != "ubuntu" ]]; then die "This test only runs on Ubuntu due to sheer laziness" fi - # Ref: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27270#note_499585550 - remove_packaged_podman_files make install PREFIX=/usr ETCDIR=/etc |