opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 12:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Use newly built VM Cache and Base images

Browse Source 
Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2020-01-02 10:18:31 -05:00
parent 958268ae59
commit d17a0bc63e
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.cirrus.yml
View File

@ -29,9 +29,8 @@ env:
#### ####
#### Cache-image names to test with #### Cache-image names to test with
### ###
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-4844850202017792" FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-6310930547998720"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-4844850202017792" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-6310930547998720"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-4844850202017792"
#### ####
#### Variables for composing new cache-images (used in PR testing) from #### Variables for composing new cache-images (used in PR testing) from
@ -216,7 +215,7 @@ build_each_commit_task:
failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh' failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh'
# Update metadata on VM images referenced by this repository state # CRITICAL: Update metadata on VM images referenced by this repository state
meta_task: meta_task:
depends_on: depends_on:
@ -234,7 +233,6 @@ meta_task:
# Space-separated list of images used by this repository state # Space-separated list of images used by this repository state
IMGNAMES: >- IMGNAMES: >-
${FEDORA_CACHE_IMAGE_NAME} ${FEDORA_CACHE_IMAGE_NAME}
${PRIOR_FEDORA_CACHE_IMAGE_NAME}
${UBUNTU_CACHE_IMAGE_NAME} ${UBUNTU_CACHE_IMAGE_NAME}
${IMAGE_BUILDER_CACHE_IMAGE_NAME} ${IMAGE_BUILDER_CACHE_IMAGE_NAME}
BUILDID: "${CIRRUS_BUILD_ID}" BUILDID: "${CIRRUS_BUILD_ID}"
@ -265,7 +263,6 @@ testing_task:
matrix: matrix:
# Images are generated separately, from build_images_task (below) # Images are generated separately, from build_images_task (below)
image_name: "${FEDORA_CACHE_IMAGE_NAME}" image_name: "${FEDORA_CACHE_IMAGE_NAME}"
#image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
image_name: "${UBUNTU_CACHE_IMAGE_NAME}" image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
timeout_in: 120m timeout_in: 120m

10
contrib/cirrus/lib.sh
View File

@ -55,14 +55,12 @@ PACKER_VER="1.3.5"
# CSV of cache-image names to build (see $PACKER_BASE/libpod_images.json) # CSV of cache-image names to build (see $PACKER_BASE/libpod_images.json)
# Base-images rarely change, define them here so they're out of the way. # Base-images rarely change, define them here so they're out of the way.
PACKER_BUILDS="${PACKER_BUILDS:-ubuntu-18,fedora-29,fedora-28}" PACKER_BUILDS="${PACKER_BUILDS:-ubuntu-18,fedora-29}"
# Google-maintained base-image names # Google-maintained base-image names
UBUNTU_BASE_IMAGE="ubuntu-1804-bionic-v20181203a" UBUNTU_BASE_IMAGE="ubuntu-1804-bionic-v20200108"
# Manually produced base-image names (see $SCRIPT_BASE/README.md) # Manually produced base-image names (see $SCRIPT_BASE/README.md)
FEDORA_BASE_IMAGE="fedora-cloud-base-29-1-2-1541789245" FEDORA_BASE_IMAGE="fedora-cloud-base-29-1-2-1565360543"
# FEDORA_BASE_IMAGE: "fedora-cloud-base-30-1-2-1556821664" PRIOR_FEDORA_BASE_IMAGE="NOT USED"
PRIOR_FEDORA_BASE_IMAGE="fedora-cloud-base-28-1-1-1544474897"
# PRIOR_FEDORA_BASE_IMAGE="fedora-cloud-base-29-1-2-1541789245"
BUILT_IMAGE_SUFFIX="${BUILT_IMAGE_SUFFIX:--$CIRRUS_REPO_NAME-${CIRRUS_BUILD_ID}}" BUILT_IMAGE_SUFFIX="${BUILT_IMAGE_SUFFIX:--$CIRRUS_REPO_NAME-${CIRRUS_BUILD_ID}}"
# Safe env. vars. to transfer from root -> $ROOTLESS_USER (go env handled separetly) # Safe env. vars. to transfer from root -> $ROOTLESS_USER (go env handled separetly)