opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add rootless docker-compose test to the CI

Browse Source 
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
This commit is contained in:
Paul Holzinger
2021-04-01 00:32:56 +02:00
parent 973807092d
commit d1e32dc6c6
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.cirrus.yml
View File

@ -440,7 +440,7 @@ apiv2_test_task:
time_script: '$SCRIPT_BASE/logcollector.sh time' time_script: '$SCRIPT_BASE/logcollector.sh time'
compose_test_task: compose_test_task:
name: "compose test on $DISTRO_NV" name: "compose test on $DISTRO_NV ($PRIV_NAME)"
alias: compose_test alias: compose_test
only_if: *not_docs only_if: *not_docs
skip: *tags skip: *tags
@ -450,6 +450,11 @@ compose_test_task:
env: env:
<<: *stdenvars <<: *stdenvars
TEST_FLAVOR: compose TEST_FLAVOR: compose
matrix:
- env:
PRIV_NAME: root
- env:
PRIV_NAME: rootless
clone_script: *noop # Comes from cache clone_script: *noop # Comes from cache
gopath_cache: *ro_gopath_cache gopath_cache: *ro_gopath_cache
setup_script: *setup setup_script: *setup

25
contrib/cirrus/runner.sh
View File

@ -288,18 +288,6 @@ dotest() {
exec_container # does not return exec_container # does not return
fi; fi;
# shellcheck disable=SC2154
if [[ "$PRIV_NAME" == "rootless" ]] && [[ "$UID" -eq 0 ]]; then
req_env_vars ROOTLESS_USER
msg "Re-executing runner through ssh as user '$ROOTLESS_USER'"
msg "************************************************************"
set -x
exec ssh $ROOTLESS_USER@localhost \
-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-o CheckHostIP=no $GOSRC/$SCRIPT_BASE/runner.sh
# does not return
fi
# containers/automation sets this to 0 for its dbg() function # containers/automation sets this to 0 for its dbg() function
# but the e2e integration tests are also sensitive to it. # but the e2e integration tests are also sensitive to it.
unset DEBUG unset DEBUG
@ -340,6 +328,19 @@ msg "************************************************************"
((${SETUP_ENVIRONMENT:-0})) || \ ((${SETUP_ENVIRONMENT:-0})) || \
die "Expecting setup_environment.sh to have completed successfully" die "Expecting setup_environment.sh to have completed successfully"
# shellcheck disable=SC2154
if [[ "$PRIV_NAME" == "rootless" ]] && [[ "$UID" -eq 0 ]]; then
req_env_vars ROOTLESS_USER
msg "Re-executing runner through ssh as user '$ROOTLESS_USER'"
msg "************************************************************"
set -x
exec ssh $ROOTLESS_USER@localhost \
-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-o CheckHostIP=no $GOSRC/$SCRIPT_BASE/runner.sh
# Does not return!
fi
# else: not running rootless, do nothing special
cd "${GOSRC}/" cd "${GOSRC}/"
handler="_run_${TEST_FLAVOR}" handler="_run_${TEST_FLAVOR}"