diff --git a/.cirrus.yml b/.cirrus.yml index d0f638b6..94267b51 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -21,7 +21,7 @@ env: SCRIPT_BASE: "./contrib/cirrus" # Google-cloud VM Images - IMAGE_SUFFIX: "c20241010t105554z-f40f39d13" + IMAGE_SUFFIX: "c20241107t210000z-f41f40d13" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" # Container FQIN's @@ -67,7 +67,7 @@ doccheck_task: # TODO: Can't use 'runner.sh setup' inside container. However, # removing the pre-installed package is the only necessary step # at the time of this comment. - dnf erase -y skopeo # Guarantee non-interference + dnf remove -y skopeo # Guarantee non-interference "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index d74b26b9..bd6a40d8 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -53,7 +53,7 @@ _run_setup() { fi # VM's come with the distro. skopeo package pre-installed - dnf erase -y skopeo + dnf remove -y skopeo msg "Removing systemd-resolved from nsswitch.conf" # /etc/resolv.conf is already set to bypass systemd-resolvd