cirrus: add seperate task and matrix for rootless

Split rootless testing into its own cirrus task and do not merge it with existing rootless tests. Signed-off-by: Aditya R <arajan@redhat.com>
rhatdan · Mar 8, 2022 · 5eccef1 · 5eccef1
1 parent d27b883
commit 5eccef1
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -222,17 +222,14 @@ integration_task:
             DISTRO_NV: "${FEDORA_NAME}"
             IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"
             STORAGE_DRIVER: 'overlay'
-            PRIV_NAME: rootless
         - env:
             DISTRO_NV: "${PRIOR_FEDORA_NAME}"
             IMAGE_NAME: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
             STORAGE_DRIVER: 'overlay'
-            PRIV_NAME: rootless
         - env:
             DISTRO_NV: "${UBUNTU_NAME}"
             IMAGE_NAME: "${UBUNTU_CACHE_IMAGE_NAME}"
             STORAGE_DRIVER: 'overlay'
-            PRIV_NAME: rootless
 
     gce_instance:
         image_name: "$IMAGE_NAME"
@@ -255,6 +252,44 @@ integration_task:
         package_versions_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh packages'
         golang_version_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh golang'
 
+integration_rootless_task:
+    name: "Integration rootless $DISTRO_NV w/ $STORAGE_DRIVER"
+    alias: integration_rootless
+    only_if: *not_docs
+    depends_on: *smoke_vendor_cross
+
+    matrix:
+        # Running rootless tests on overlay
+        # OVERLAY
+        - env:
+            DISTRO_NV: "${FEDORA_NAME}"
+            IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"
+            STORAGE_DRIVER: 'overlay'
+            PRIV_NAME: rootless
+        - env:
+            DISTRO_NV: "${PRIOR_FEDORA_NAME}"
+            IMAGE_NAME: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
+            STORAGE_DRIVER: 'overlay'
+            PRIV_NAME: rootless
+        - env:
+            DISTRO_NV: "${UBUNTU_NAME}"
+            IMAGE_NAME: "${UBUNTU_CACHE_IMAGE_NAME}"
+            STORAGE_DRIVER: 'overlay'
+            PRIV_NAME: rootless
+
+    gce_instance:
+        image_name: "$IMAGE_NAME"
+
+    # Separate scripts for separate outputs, makes debugging easier.
+    setup_script: '${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
+    build_script: '${SCRIPT_BASE}/build.sh |& ${_TIMESTAMP}'
+    integration_test_script: '${SCRIPT_BASE}/test.sh integration |& ${_TIMESTAMP}'
+
+    binary_artifacts:
+        path: ./bin/*
+
+    always:
+        <<: *standardlogs
 
 in_podman_task:
     name: "Containerized Integration"

diff --git a/Makefile b/Makefile
@@ -163,7 +163,7 @@ test-conformance:
 
 .PHONY: test-integration
 test-integration: install.tools
-	#./tests/tools/build/ginkgo $(BUILDFLAGS) -v tests/e2e/. temporarly commenting
+	./tests/tools/build/ginkgo $(BUILDFLAGS) -v tests/e2e/.
 	cd tests; ./test_runner.sh
 
 tests/testreport/testreport: tests/testreport/testreport.go

diff --git a/contrib/cirrus/test.sh b/contrib/cirrus/test.sh
@@ -13,6 +13,11 @@ if [[ "$PRIV_NAME" == "rootless" ]] && [[ "$UID" -eq 0 ]]; then
     # https://github.com/containers/podman/issues/10857
     rm -rf /var/lib/cni
 
+    # change permission of go src and cache directory
+    # so rootless user can access it
+    chown -R $ROOTLESS_USER:root /var/tmp/go
+    chmod -R g+rwx /var/tmp/go
+
     req_env_vars ROOTLESS_USER
     msg "Re-executing test through ssh as user '$ROOTLESS_USER'"
     msg "************************************************************"