containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Run unit-tests rootless 

Previously (for various reasons) the unittests were limited by the
Makefile to root-only.  However, experimentation via PR #11490
shows they will actually execute and pass when run as a regular user.
Enable this for only the latest Fedora VMs, so as to only add one new
task to the (already large) set.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2021-09-08 15:12:04 -04:00
parent 784e1ae137
commit 5fdd0431b7
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.cirrus.yml
View File

@ -144,24 +144,24 @@ build_task:
image_name: "${VM_IMAGE_NAME}" # from stdenvars image_name: "${VM_IMAGE_NAME}" # from stdenvars
matrix: &platform_axis matrix: &platform_axis
# Ref: https://cirrus-ci.org/guide/writing-tasks/#matrix-modification # Ref: https://cirrus-ci.org/guide/writing-tasks/#matrix-modification
- env: &stdenvars - env: &stdenvars
DISTRO_NV: ${FEDORA_NAME} DISTRO_NV: ${FEDORA_NAME}
# Not used here, is used in other tasks # Not used here, is used in other tasks
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
# ID for re-use of build output # ID for re-use of build output
_BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID} _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
- env: - env: &priorfedora_envvars
DISTRO_NV: ${PRIOR_FEDORA_NAME} DISTRO_NV: ${PRIOR_FEDORA_NAME}
VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
_BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID} _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
- env: - env: &ubuntu_envvars
DISTRO_NV: ${UBUNTU_NAME} DISTRO_NV: ${UBUNTU_NAME}
VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME}
CTR_FQIN: ${UBUNTU_CONTAINER_FQIN} CTR_FQIN: ${UBUNTU_CONTAINER_FQIN}
_BUILD_CACHE_HANDLE: ${UBUNTU_NAME}-build-${CIRRUS_BUILD_ID} _BUILD_CACHE_HANDLE: ${UBUNTU_NAME}-build-${CIRRUS_BUILD_ID}
- env: - env: &priorubuntu_envvars
DISTRO_NV: ${PRIOR_UBUNTU_NAME} DISTRO_NV: ${PRIOR_UBUNTU_NAME}
VM_IMAGE_NAME: ${PRIOR_UBUNTU_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${PRIOR_UBUNTU_CACHE_IMAGE_NAME}
CTR_FQIN: ${PRIOR_UBUNTU_CONTAINER_FQIN} CTR_FQIN: ${PRIOR_UBUNTU_CONTAINER_FQIN}
@ -404,7 +404,16 @@ unit_test_task:
only_if: *not_docs only_if: *not_docs
depends_on: depends_on:
- validate - validate
matrix: *platform_axis matrix:
- env: *stdenvars
- env: *priorfedora_envvars
- env: *ubuntu_envvars
- env: *priorubuntu_envvars
# Special-case: Rootless on latest Fedora (standard) VM
- name: "Rootless unit on $DISTRO_NV"
env:
<<: *stdenvars
PRIV_NAME: rootless
gce_instance: *standardvm gce_instance: *standardvm
env: env:
TEST_FLAVOR: unit TEST_FLAVOR: unit

1
Makefile
View File

@ -492,7 +492,6 @@ run-docker-py-tests:
.PHONY: localunit .PHONY: localunit
localunit: test/goecho/goecho localunit: test/goecho/goecho
hack/check_root.sh make localunit
rm -rf ${COVERAGE_PATH} && mkdir -p ${COVERAGE_PATH} rm -rf ${COVERAGE_PATH} && mkdir -p ${COVERAGE_PATH}
$(GOBIN)/ginkgo \ $(GOBIN)/ginkgo \
-r \ -r \