opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9554 from cevich/new_f34b_images

Browse Source 
Cirrus: Use Fedora 34beta images
This commit is contained in:
OpenShift Merge Robot
2021-04-08 11:50:04 -04:00
committed by GitHub
parent 99e3111814 ec88445fc8
commit a81b078a58
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.cirrus.yml
View File

@ -24,13 +24,13 @@ 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-33" FEDORA_NAME: "fedora-34beta"
PRIOR_FEDORA_NAME: "fedora-32" PRIOR_FEDORA_NAME: "fedora-33"
UBUNTU_NAME: "ubuntu-2010" UBUNTU_NAME: "ubuntu-2010"
PRIOR_UBUNTU_NAME: "ubuntu-2004" PRIOR_UBUNTU_NAME: "ubuntu-2004"
# Google-cloud VM Images # Google-cloud VM Images
IMAGE_SUFFIX: "c6518453914828800" IMAGE_SUFFIX: "c5032481331085312"
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}"
@ -151,11 +151,11 @@ build_task:
CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
# ID for re-use of build output # ID for re-use of build output
_BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID} _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
# - env: - env:
# DISTRO_NV: ${PRIOR_FEDORA_NAME} DISTRO_NV: ${PRIOR_FEDORA_NAME}
# VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
# CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
# _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID} _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
- env: - env:
DISTRO_NV: ${UBUNTU_NAME} DISTRO_NV: ${UBUNTU_NAME}
VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_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} _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
# - env: - env:
# DISTRO_NV: ${PRIOR_FEDORA_NAME} DISTRO_NV: ${PRIOR_FEDORA_NAME}
# _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID} _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
# VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
# CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
gce_instance: *standardvm gce_instance: *standardvm
timeout_in: 90m timeout_in: 90m
env: env:

2
Makefile
View File

@ -703,7 +703,7 @@ vendor:
.PHONY: vendor-in-container .PHONY: vendor-in-container
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 .PHONY: package
package: ## Build rpm packages package: ## Build rpm packages

1
contrib/cirrus/pr-should-include-tests
View File

@ -32,6 +32,7 @@ fi
# This is OK if the only files being touched are "safe" ones. # This is OK if the only files being touched are "safe" ones.
filtered_changes=$(git diff --name-status $base $head | filtered_changes=$(git diff --name-status $base $head |
awk '{print $2}' | awk '{print $2}' |
fgrep -vx Makefile |
fgrep -vx .cirrus.yml | fgrep -vx .cirrus.yml |
fgrep -vx changelog.txt | fgrep -vx changelog.txt |
fgrep -vx go.mod | fgrep -vx go.mod |

11
contrib/cirrus/setup_environment.sh
View File

@ -50,14 +50,9 @@ echo -e "\n# Begin single-use VM global variables (${BASH_SOURCE[0]})" \
done <<<"$(passthrough_envars)" done <<<"$(passthrough_envars)"
) >> "/etc/ci_environment" ) >> "/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. # This is a possible manual maintenance gaff, check to be sure everything matches.
# shellcheck disable=SC2154 # shellcheck disable=SC2154
[[ "$DISTRO_NV" == "$OS_REL_VER" ]] || \ [[ "$DISTRO_NV" =~ $OS_REL_VER ]] || \
die "Automation spec. '$DISTRO_NV'; actual host '$OS_REL_VER'" die "Automation spec. '$DISTRO_NV'; actual host '$OS_REL_VER'"
# Only allow this script to execute once # Only allow this script to execute once
@ -200,7 +195,9 @@ case "$TEST_FLAVOR" in
build) make clean ;; build) make clean ;;
unit) ;; unit) ;;
apiv2) ;& # use next item apiv2) ;& # use next item
compose) ;& compose)
dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker*
;& # continue with next item
int) ;& int) ;&
sys) ;& sys) ;&
upgrade_test) ;& upgrade_test) ;&