Skip to content

Commit cb2c674

Browse files
committed
Test containers_image_sequoia in CI
CI images come from containers/automation_images#411 . Signed-off-by: Miloslav Trmač <[email protected]>
1 parent 8d52972 commit cb2c674

File tree

1 file changed

+26
-2
lines changed

1 file changed

+26
-2
lines changed

.cirrus.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,14 @@ env:
3030
SKOPEO_PR:
3131

3232
# Google-cloud VM Images
33-
IMAGE_SUFFIX: "c20250721t181111z-f42f41d13"
33+
# If you are updating IMAGE_SUFFIX: We are currently using rawhide for
34+
# the containers_image_sequoia tests because the rust-podman-sequoia
35+
# package is not available in earlier releases; once we update to a future
36+
# Fedora release (or if the package is backported), switch back from Rawhide
37+
# to the latest Fedora release.
38+
IMAGE_SUFFIX: "c20250812t173301z-f42f41d13"
3439
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
40+
RAWHIDE_CACHE_IMAGE_NAME: "rawhide-${IMAGE_SUFFIX}"
3541

3642
# Container FQIN's (include bleeding-edge development-level container deps.)
3743
FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
@@ -55,9 +61,12 @@ validate_task:
5561
# Required to be 200gig, do not modify - has i/o performance impact
5662
# according to gcloud CLI tool warning messages.
5763
disk: 200
58-
image_name: ${FEDORA_CACHE_IMAGE_NAME}
64+
# Eventually, hard-code FEDORA_CACHE_IMAGE_NAME here again and remove the
65+
# VM_IMAGE_NAME parameter.
66+
image_name: ${VM_IMAGE_NAME}
5967
env:
6068
HOME: "/root" # default unset, needed by golangci-lint.
69+
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
6170
script: |
6271
git remote update
6372
make tools
@@ -68,6 +77,8 @@ validate_task:
6877
cross_task:
6978
only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
7079
gce_instance: *fedora_vm
80+
env:
81+
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
7182
script: make cross
7283

7384

@@ -81,9 +92,15 @@ test_task:
8192
- name: "Test"
8293
env:
8394
BUILDTAGS: ''
95+
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
8496
- name: "Test w/ opengpg"
8597
env:
8698
BUILDTAGS: &withopengpg 'containers_image_openpgp'
99+
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
100+
- name: "Test w/ Sequoia (currently Rawhide)"
101+
env:
102+
BUILDTAGS: &withsequoia 'containers_image_sequoia'
103+
VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
87104
script: ${GOSRC}/${SCRIPT_BASE}/runner.sh image_tests
88105

89106

@@ -102,9 +119,15 @@ test_skopeo_task:
102119
- name: "Skopeo Test"
103120
env:
104121
BUILDTAGS: ''
122+
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
105123
- name: "Skopeo Test w/ opengpg"
106124
env:
107125
BUILDTAGS: *withopengpg
126+
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
127+
- name: "Skopeo Test w/ Sequoia (currently Rawhide)"
128+
env:
129+
BUILDTAGS: *withsequoia
130+
VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
108131
setup_script: >-
109132
"${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
110133
vendor_script: >-
@@ -133,6 +156,7 @@ meta_task:
133156
# Space-separated list of images used by this repository state
134157
IMGNAMES: |
135158
${FEDORA_CACHE_IMAGE_NAME}
159+
${RAWHIDE_CACHE_IMAGE_NAME}
136160
BUILDID: "${CIRRUS_BUILD_ID}"
137161
REPOREF: "${CIRRUS_REPO_NAME}"
138162
GCPJSON: ENCRYPTED[04306103eee1933f87deb8a5af6514a7e3164aa589d6079abc0451eb2360879430ed020d6e025ca64ef667138ce9d786]

0 commit comments

Comments
 (0)