Skip to content

Commit

Permalink
Merge pull request containers#15030 from cevich/gitlab_comment
Browse files Browse the repository at this point in the history
[CI:DOCS] Cirrus: Add prominent gitlab warning
  • Loading branch information
openshift-merge-robot authored Jul 21, 2022
2 parents 5f53a67 + bc6a48e commit 34b2018
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
3 changes: 3 additions & 0 deletions contrib/cirrus/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 20 additions & 3 deletions contrib/cirrus/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 34b2018

Please sign in to comment.