github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-21 18:02:08 +00:00
Code Issues Projects Releases Wiki Activity

Cirrus: Update to F36 w/ netavark+aardvark-dns

Browse Source 
Also includes some updates relating to improvements in the common
automation library.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2022-04-28 10:45:23 -04:00
parent 89acf46019
commit 916a395d82
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cirrus.yml
View File

@ -23,12 +23,12 @@ env:
#### ####
#### Cache-image names to test with (double-quotes around names are critical) #### Cache-image names to test with (double-quotes around names are critical)
#### ####
FEDORA_NAME: "fedora-35" FEDORA_NAME: "fedora-36"
PRIOR_FEDORA_NAME: "fedora-34" PRIOR_FEDORA_NAME: "fedora-35"
UBUNTU_NAME: "ubuntu-2110" UBUNTU_NAME: "ubuntu-2110"
# Google-cloud VM Images # Google-cloud VM Images
IMAGE_SUFFIX: "c4764556961513472" IMAGE_SUFFIX: "c4955393725038592"
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}"

6
contrib/cirrus/runner.sh
View File

@ -30,12 +30,6 @@ else
) > /dev/stderr ) > /dev/stderr
fi fi
OS_RELEASE_ID="$(source /etc/os-release; echo $ID)"
# GCE image-name compatible string representation of distribution _major_ version
OS_RELEASE_VER="$(source /etc/os-release; echo $VERSION_ID | tr -d '.')"
# Combined to ease some usage
OS_REL_VER="${OS_RELEASE_ID}-${OS_RELEASE_VER}"
# This is the magic interpreted by the tests to allow modifying local config/services. # This is the magic interpreted by the tests to allow modifying local config/services.
SKOPEO_CONTAINER_TESTS=1 SKOPEO_CONTAINER_TESTS=1

15
hack/make/test-system
View File

@ -1,14 +1,21 @@
#!/bin/bash #!/bin/bash
set -e set -e
# Before running podman for the first time, make sure # These tests can run in/outside of a container. However,
# to set storage to vfs (not overlay): podman-in-podman # not all storage drivers are supported in a container
# doesn't work with overlay. And, disable mountopt, # environment. Detect this and setup storage when
# which causes error with vfs. # running in a container.
if ((SKOPEO_CONTAINER_TESTS)) && [[ -r /etc/containers/storage.conf ]]; then
sed -i \ sed -i \
-e 's/^driver\s*=.*/driver = "vfs"/' \ -e 's/^driver\s*=.*/driver = "vfs"/' \
-e 's/^mountopt/#mountopt/' \ -e 's/^mountopt/#mountopt/' \
/etc/containers/storage.conf /etc/containers/storage.conf
elif ((SKOPEO_CONTAINER_TESTS)); then
cat >> /etc/containers/storage.conf << EOF
[storage]
driver = "vfs"
EOF
fi
# Build skopeo, install into /usr/bin # Build skopeo, install into /usr/bin
make PREFIX=/usr install make PREFIX=/usr install