github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-28 07:37:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1821 from cevich/F37_update

Browse Source 
Cirrus: Update to F37 CI VM Images
This commit is contained in:
Miloslav Trmač 2023-01-18 17:16:13 +01:00 committed by GitHub
commit b51eb214c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cirrus.yml
View File

@ -23,10 +23,10 @@ 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-36" FEDORA_NAME: "fedora-37"
# Google-cloud VM Images # Google-cloud VM Images
IMAGE_SUFFIX: "c5495735033528320" IMAGE_SUFFIX: "c6300530360713216"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
# Container FQIN's # Container FQIN's

29
contrib/cirrus/runner.sh
View File

@ -55,9 +55,6 @@ _run_setup() {
# VM's come with the distro. skopeo package pre-installed # VM's come with the distro. skopeo package pre-installed
dnf erase -y skopeo dnf erase -y skopeo
# Required for testing the SIF transport
dnf install -y fakeroot squashfs-tools
msg "Removing systemd-resolved from nsswitch.conf" msg "Removing systemd-resolved from nsswitch.conf"
# /etc/resolv.conf is already set to bypass systemd-resolvd # /etc/resolv.conf is already set to bypass systemd-resolvd
sed -i -r -e 's/^(hosts.+)resolve.+dns/\1dns/' /etc/nsswitch.conf sed -i -r -e 's/^(hosts.+)resolve.+dns/\1dns/' /etc/nsswitch.conf
@ -115,18 +112,32 @@ _run_unit() {
make test-unit-local BUILDTAGS="$BUILDTAGS" make test-unit-local BUILDTAGS="$BUILDTAGS"
} }
_run_integration() { _podman_reset() {
# Ensure we start with a clean-slate # Ensure we start with a clean-slate
podman system reset --force showrun podman system reset --force
# Don't pollute the CI environment
(
source $CIRRUS_WORKING_DIR/systemtest/helpers.bash
# WARNING WARNING WARNING WARNING
# Without running a container, the system tests will inexplicably
# fail with obscure errors/warning messages. I have no idea why
# running a container after a `system reset` fixes/prevents the
# problem. The failures do not reproduce when tests are run manually.
# So unless or until /until somebody develops a better understanding,
# this fix is JFM.
# WARNING WARNING WARNING WARNING
showrun podman run -it --rm --entrypoint /bin/true $REGISTRY_FQIN
)
}
_run_integration() {
_podman_reset
make test-integration-local BUILDTAGS="$BUILDTAGS" make test-integration-local BUILDTAGS="$BUILDTAGS"
} }
_run_system() { _run_system() {
# Ensure we start with a clean-slate _podman_reset
podman system reset --force ##### Note: Test MODIFIES THE HOST SETUP #####
# Executes with containers required for testing.
make test-system-local BUILDTAGS="$BUILDTAGS" make test-system-local BUILDTAGS="$BUILDTAGS"
} }

9
systemtest/010-inspect.bats
View File

@ -95,10 +95,11 @@ END_EXPECT
# is created by the make-noarch-manifest script in this directory. # is created by the make-noarch-manifest script in this directory.
img=docker://quay.io/libpod/notmyarch:20210121 img=docker://quay.io/libpod/notmyarch:20210121
# Get our host arch (what we're running on). This assumes that skopeo # Get our host golang arch (what we're running on, according to golang).
# arch matches podman; it also assumes running podman >= April 2020 # This assumes that skopeo arch matches host arch (which it always should).
# (prior to that, the format keys were lower-case). # Buildah is used here because it depends less on the exact system config
arch=$(podman info --format '{{.Host.Arch}}') # than podman - and all we're really after is the golang-flavored arch name.
arch=$(go env GOARCH)
# By default, 'inspect' tries to match our host os+arch. This should fail. # By default, 'inspect' tries to match our host os+arch. This should fail.
run_skopeo 1 inspect $img run_skopeo 1 inspect $img