summaryrefslogtreecommitdiff
path: root/.cirrus.yml
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-03-18 15:17:46 -0400
committerChris Evich <cevich@redhat.com>2019-03-19 13:00:18 -0400
commit37eb694bd073b8dff265be137ae75eac81e9d769 (patch)
tree99e158529ea8f6b20ed1ab266c0168c9f78f68a0 /.cirrus.yml
parent537c382f5bd098bc89a457554db9bd0b08eab3c2 (diff)
downloadpodman-37eb694bd073b8dff265be137ae75eac81e9d769.tar.gz
podman-37eb694bd073b8dff265be137ae75eac81e9d769.tar.bz2
podman-37eb694bd073b8dff265be137ae75eac81e9d769.zip
Cirrus: Various fixes for rootless testing
* Randomize the user's UID and GID * Simplify `setup_environment.sh` * Support new "-r" option for `hack/get_ci_vm.sh` setting up rootless * Connect as $ROOTLESS_USER when using "-r" with `hack/get_ci_vm.sh` Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to '.cirrus.yml')
-rw-r--r--.cirrus.yml6
1 files changed, 1 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 01689971a..29606d145 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -70,8 +70,6 @@ env:
#### Default to NOT running in rootless-testing mode
####
ROOTLESS_USER: ""
- ROOTLESS_UID: ""
- ROOTLESS_GID: ""
####
#### Credentials and other secret-sauces, decrypted at runtime when authorized.
@@ -101,7 +99,7 @@ env:
CIRRUS_TASK_ID CIRRUS_REPO_NAME CIRRUS_REPO_OWNER CIRRUS_REPO_FULL_NAME
CIRRUS_REPO_CLONE_URL CIRRUS_SHELL CIRRUS_USER_COLLABORATOR CIRRUS_USER_PERMISSION
CIRRUS_WORKING_DIR CIRRUS_HTTP_CACHE_HOST PACKER_BUILDS BUILT_IMAGE_SUFFIX
- XDG_DATA_DIRS XDG_RUNTIME_DIR XDG_SESSION_ID ROOTLESS_USER ROOTLESS_UID ROOTLESS_GID
+ XDG_DATA_DIRS XDG_RUNTIME_DIR XDG_SESSION_ID ROOTLESS_USER
# Every *_task runs in parallel in separate VMsd. The name prefix only for reference
@@ -252,8 +250,6 @@ rootless_testing_task:
env:
ROOTLESS_USER: "olympiclongjumpingwithjesus"
- ROOTLESS_UID: 123456
- ROOTLESS_GID: 123456
timeout_in: 120m