Merge pull request containers#8306 from edsantiago/ci_update_vms

Cirrus: update VMs
rhatdan · Nov 11, 2020 · ea75312 · ea75312
2 parents 12dbc1f + 92e31a2
commit ea75312
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -27,7 +27,7 @@ env:
     PRIOR_UBUNTU_NAME: "ubuntu-19"
 
     # Google-cloud VM Images
-    IMAGE_SUFFIX: "c6323493627232256"
+    IMAGE_SUFFIX: "c5402398833246208"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
     UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"

diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
@@ -51,9 +51,6 @@ function _run_validate() {
     bin/podman --version
     bin/podman-remote --version
 
-    # FIXME FIXME FIXME: 2020-11-10: remove once Fedora 33 has FindBin
-    perl -MFindBin -e 0 &>/dev/null || dnf -y install perl-FindBin
-
     make validate  # Some items require a build
 }