opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12793 from cevich/vmimg_update

Browse Source 
Enable gitlab runner unit testing + Freshen VM images w/ crun-1.4-1
This commit is contained in:
OpenShift Merge Robot
2022-01-10 23:13:09 +01:00
committed by GitHub
parent 92cd152b53 799078216b
commit 2790b5c69c
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.cirrus.yml
View File

@ -29,7 +29,7 @@ env:
UBUNTU_NAME: "ubuntu-2110" UBUNTU_NAME: "ubuntu-2110"
# Google-cloud VM Images # Google-cloud VM Images
IMAGE_SUFFIX: "c6015869890330624" IMAGE_SUFFIX: "c6454758209748992"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
@ -612,10 +612,10 @@ rootless_gitlab_test_task:
alias: rootless_gitlab_test alias: rootless_gitlab_test
skip: *tags skip: *tags
only_if: *not_docs only_if: *not_docs
# Test temporarily ignored due to failure on/around 7-10th Dec. 2021 # Community-maintained downstream test may fail unexpectedly.
# Appears related to https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28732 # Ref. repository: https://gitlab.com/gitlab-org/gitlab-runner
# Log: https://cirrus-ci.com/task/5708221852680192?logs=setup#L433 # If necessary, uncomment the next line and file issue(s) with details.
allow_failures: $CI == $CI # allow_failures: $CI == $CI
depends_on: depends_on:
- rootless_integration_test - rootless_integration_test
gce_instance: *standardvm gce_instance: *standardvm

6
contrib/cirrus/setup_environment.sh
View File

@ -118,12 +118,6 @@ fi
case "$OS_RELEASE_ID" in case "$OS_RELEASE_ID" in
ubuntu) ;; ubuntu) ;;
fedora) fedora)
# Force a crun version that has this fix: https://github.com/containers/crun/pull/819
# FIXME: Remove once a fixed crun made its way into Fedora
if test "$OS_RELEASE_VER" == "35"; then
yum upgrade -y crun
fi
if ((CONTAINER==0)); then if ((CONTAINER==0)); then
# All SELinux distros need this for systemd-in-a-container # All SELinux distros need this for systemd-in-a-container
msg "Enabling container_manage_cgroup" msg "Enabling container_manage_cgroup"