summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-08 11:50:04 -0400
committerGitHub <noreply@github.com>2021-04-08 11:50:04 -0400
commita81b078a588fa5f9b5b42b2ffc894d00f06980c3 (patch)
tree040ab197f5e1557f9d298bb0e9d30f7b25f445a8
parent99e3111814225e4e0cb2c7dc882b7f2e450d70aa (diff)
parentec88445fc83d666ec3f51e14acd1e5d3fd920863 (diff)
downloadpodman-a81b078a588fa5f9b5b42b2ffc894d00f06980c3.tar.gz
podman-a81b078a588fa5f9b5b42b2ffc894d00f06980c3.tar.bz2
podman-a81b078a588fa5f9b5b42b2ffc894d00f06980c3.zip
Merge pull request #9554 from cevich/new_f34b_images
Cirrus: Use Fedora 34beta images
-rw-r--r--.cirrus.yml26
-rw-r--r--Makefile2
-rwxr-xr-xcontrib/cirrus/pr-should-include-tests1
-rwxr-xr-xcontrib/cirrus/setup_environment.sh11
4 files changed, 19 insertions, 21 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 0b69f83fd..194bcae52 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -24,13 +24,13 @@ env:
####
#### Cache-image names to test with (double-quotes around names are critical)
####
- FEDORA_NAME: "fedora-33"
- PRIOR_FEDORA_NAME: "fedora-32"
+ FEDORA_NAME: "fedora-34beta"
+ PRIOR_FEDORA_NAME: "fedora-33"
UBUNTU_NAME: "ubuntu-2010"
PRIOR_UBUNTU_NAME: "ubuntu-2004"
# Google-cloud VM Images
- IMAGE_SUFFIX: "c6518453914828800"
+ IMAGE_SUFFIX: "c5032481331085312"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
@@ -151,11 +151,11 @@ build_task:
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
# ID for re-use of build output
_BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
- # - env:
- # DISTRO_NV: ${PRIOR_FEDORA_NAME}
- # VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
- # CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
- # _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
+ - env:
+ DISTRO_NV: ${PRIOR_FEDORA_NAME}
+ VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
+ CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
+ _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
- env:
DISTRO_NV: ${UBUNTU_NAME}
VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME}
@@ -515,11 +515,11 @@ container_integration_test_task:
_BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
- # - env:
- # DISTRO_NV: ${PRIOR_FEDORA_NAME}
- # _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
- # VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
- # CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
+ - env:
+ DISTRO_NV: ${PRIOR_FEDORA_NAME}
+ _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
+ VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
+ CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
gce_instance: *standardvm
timeout_in: 90m
env:
diff --git a/Makefile b/Makefile
index a70e07991..55e15d049 100644
--- a/Makefile
+++ b/Makefile
@@ -703,7 +703,7 @@ vendor:
.PHONY: vendor-in-container
vendor-in-container:
- podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.13 make vendor
+ podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.16 make vendor
.PHONY: package
package: ## Build rpm packages
diff --git a/contrib/cirrus/pr-should-include-tests b/contrib/cirrus/pr-should-include-tests
index e3c5d5da1..2bc06df50 100755
--- a/contrib/cirrus/pr-should-include-tests
+++ b/contrib/cirrus/pr-should-include-tests
@@ -32,6 +32,7 @@ fi
# This is OK if the only files being touched are "safe" ones.
filtered_changes=$(git diff --name-status $base $head |
awk '{print $2}' |
+ fgrep -vx Makefile |
fgrep -vx .cirrus.yml |
fgrep -vx changelog.txt |
fgrep -vx go.mod |
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 36878365d..86b8d78ef 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -50,14 +50,9 @@ echo -e "\n# Begin single-use VM global variables (${BASH_SOURCE[0]})" \
done <<<"$(passthrough_envars)"
) >> "/etc/ci_environment"
-#####
-##### FIXME. /etc/containers/storage.conf should have a driver name set
-##### Remove when VMs updated
-sed 's/^driver.*=.*""/driver = "overlay"/g' -i /etc/containers/storage.conf
-
# This is a possible manual maintenance gaff, check to be sure everything matches.
# shellcheck disable=SC2154
-[[ "$DISTRO_NV" == "$OS_REL_VER" ]] || \
+[[ "$DISTRO_NV" =~ $OS_REL_VER ]] || \
die "Automation spec. '$DISTRO_NV'; actual host '$OS_REL_VER'"
# Only allow this script to execute once
@@ -200,7 +195,9 @@ case "$TEST_FLAVOR" in
build) make clean ;;
unit) ;;
apiv2) ;& # use next item
- compose) ;&
+ compose)
+ dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker*
+ ;& # continue with next item
int) ;&
sys) ;&
upgrade_test) ;&