summaryrefslogtreecommitdiff
path: root/.cirrus.yml
diff options
context:
space:
mode:
Diffstat (limited to '.cirrus.yml')
-rw-r--r--.cirrus.yml77
1 files changed, 16 insertions, 61 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 58f56798c..8ae1bb2f2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -34,12 +34,12 @@ env:
####
#### Cache-image names to test with (double-quotes around names are critical)
###
- FEDORA_NAME: "fedora-31"
- PRIOR_FEDORA_NAME: "fedora-30"
+ FEDORA_NAME: "fedora-32"
+ PRIOR_FEDORA_NAME: "fedora-31"
UBUNTU_NAME: "ubuntu-19"
PRIOR_UBUNTU_NAME: "ubuntu-18"
- _BUILT_IMAGE_SUFFIX: "libpod-6465271544152064"
+ _BUILT_IMAGE_SUFFIX: "libpod-6301182083727360"
FEDORA_CACHE_IMAGE_NAME: "${FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "${PRIOR_FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "${UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}"
@@ -401,16 +401,16 @@ testing_task:
- name: "test ${FEDORA_NAME}"
gce_instance:
image_name: "${FEDORA_CACHE_IMAGE_NAME}"
- # FIXME
- #- name: "test ${PRIOR_FEDORA_NAME}"
- # gce_instance:
- # image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
- # Multiple test failures on Ubuntu 19 - Fixes TBD in future PR
- # TODO: image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
- # FIXME
- #- name: "test ${PRIOR_UBUNTU_NAME}"
- # gce_instance:
- # image_name: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}"
+ # TODO:
+ # - name: "test ${PRIOR_FEDORA_NAME}"
+ # gce_instance:
+ # image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
+ # - name: "test ${UBUNTU_NAME}"
+ # gce_instance:
+ # image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
+ # - name: "test ${PRIOR_UBUNTU_NAME}"
+ # gce_instance:
+ # image_name: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}"
timeout_in: 120m
@@ -552,21 +552,17 @@ special_testing_in_podman_task:
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
matrix:
- # FIXME: Integration testing currently broken for F31 hosts
- # Error: container_linux.go:345: starting container process caused "process_linux.go:281: applying cgroup configuration for process caused \"mountpoint for cgroup not found\"": OCI runtime error
- # image_name: "${FEDORA_CACHE_IMAGE_NAME}"
- name: "in-podman ${PRIOR_FEDORA_NAME}"
gce_instance:
image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
+ - name: "in-podman ${FEDORA_NAME}"
+ gce_instance:
+ image_name: "${FEDORA_CACHE_IMAGE_NAME}"
env:
ADD_SECOND_PARTITION: 'true'
MOD_LIBPOD_CONF: 'false' # Use existing/native setup
SPECIALMODE: 'in_podman' # See docs
- # TODO: Support both runc and crun (cgroups v1 and v2 container images)
- # matrix:
- # IN_PODMAN_IMAGE: "quay.io/libpod/in_podman:latest"
- # IN_PODMAN_IMAGE: "quay.io/libpod/in_podman_cgv2:latest"
timeout_in: 60m
@@ -759,47 +755,6 @@ verify_test_built_images_task:
<<: *standardlogs
-#test_building_snap_task:
-#
-# depends_on:
-# - "gating"
-#
-# only_if: >-
-# $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-# $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-#
-# container:
-# image: yakshaveinc/snapcraft:core18
-# snapcraft_script:
-# - 'apt-get -y update'
-# - 'cd contrib/snapcraft && snapcraft'
-#
-#
-#upload_snap_task:
-# only_if: >-
-# $CIRRUS_BRANCH != $DEST_BRANCH &&
-# $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-# $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-#
-# # Only when PR or branch is merged into master
-#
-# depends_on:
-# - "test_building_snap"
-#
-# container:
-# image: yakshaveinc/snapcraft:core18
-#
-# env:
-# SNAPCRAFT_LOGIN: ENCRYPTED[d8e82eb31c6372fec07f405f413d57806026b1a9f8400033531ebcd54d6750a5e4a8b1f68e3ec65c98c65e0d9b2a6a75]
-# snapcraft_login_file:
-# path: /root/.snapcraft/login.cfg
-# variable_name: SNAPCRAFT_LOGIN
-# snapcraft_script:
-# - 'apt-get -y update'
-# - 'snapcraft login --with "/root/.snapcraft/login.cfg"'
-# - 'cd contrib/snapcraft && snapcraft && snapcraft push *.snap --release edge'
-
-
docs_task:
# Don't run this when building/testing new VM images