summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-25 07:21:42 -0500
committerGitHub <noreply@github.com>2022-01-25 07:21:42 -0500
commitad1ff784f09e2a9a8e955055cea96be5bade7c53 (patch)
tree023309d91f0ac66e19b22aec1e5a303e62dff8fb
parent6d03146a8ccc8322d134dd41be7fc14721b8b55b (diff)
parent7cdb00a4592b0283088382997c063a1e93305efc (diff)
downloadpodman-ad1ff784f09e2a9a8e955055cea96be5bade7c53.tar.gz
podman-ad1ff784f09e2a9a8e955055cea96be5bade7c53.tar.bz2
podman-ad1ff784f09e2a9a8e955055cea96be5bade7c53.zip
Merge pull request #12993 from edsantiago/test_rootless_remote
CI: enable rootless-remote system tests
-rw-r--r--.cirrus.yml21
-rw-r--r--test/system/160-volumes.bats2
-rw-r--r--test/system/410-selinux.bats3
3 files changed, 25 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index c33ed9c0c..1bbd41b22 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -561,6 +561,26 @@ remote_system_test_task:
TEST_FLAVOR: sys
PODBIN_NAME: remote
+rootless_remote_system_test_task:
+ <<: *local_system_test_task
+ alias: rootless_remote_system_test
+ depends_on:
+ - remote_integration_test
+ matrix:
+ # Minimal sanity testing: only the latest Fedora
+ - env:
+ DISTRO_NV: ${FEDORA_NAME}
+ # Not used here, is used in other tasks
+ VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
+ CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
+ # ID for re-use of build output
+ _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
+ gce_instance: *standardvm
+ env:
+ TEST_FLAVOR: sys
+ PODBIN_NAME: remote
+ PRIV_NAME: rootless
+
buildah_bud_test_task:
name: *std_name_fmt
alias: buildah_bud_test
@@ -716,6 +736,7 @@ success_task:
- local_system_test
- remote_system_test
- rootless_system_test
+ - rootless_remote_system_test
- rootless_gitlab_test
- upgrade_test
- buildah_bud_test
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats
index 3f2d7f6bb..a3c972b3e 100644
--- a/test/system/160-volumes.bats
+++ b/test/system/160-volumes.bats
@@ -213,6 +213,8 @@ EOF
# Podman volume user test
@test "podman volume user test" {
is_rootless || skip "only meaningful when run rootless"
+ skip_if_remote "not applicable on podman-remote"
+
user="1000:2000"
newuser="100:200"
tmpdir=${PODMAN_TMPDIR}/volume_$(random_string)
diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats
index dbdfd4b9d..056a056f6 100644
--- a/test/system/410-selinux.bats
+++ b/test/system/410-selinux.bats
@@ -245,7 +245,8 @@ function check_label() {
is "$output" "system_u:object_r:container_file_t:$level $tmpdir" \
"Confined Relabel Correctly"
- if is_rootless; then
+ # podman-remote has no 'unshare'
+ if is_rootless && ! is_remote; then
run_podman unshare touch $tmpdir/test1
# Relabel entire directory
run_podman unshare chcon system_u:object_r:usr_t:s0 $tmpdir