diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-08 15:20:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 15:20:10 +0000 |
| commit | b3d5ba657b3dfbc2f33083cfd35b7baad12247f8 (patch) | |
| tree | c551fa690a8e2cea7c9e49c7ea7c0a5972e19e10 | |
| parent | 518b7cdd3956fb3c144535b400c2bfd9df09cd32 (diff) | |
| parent | 0593ceb01f7195b4401f4f963713db879c6eca2b (diff) | |
| download | podman-b3d5ba657b3dfbc2f33083cfd35b7baad12247f8.tar.gz podman-b3d5ba657b3dfbc2f33083cfd35b7baad12247f8.tar.bz2 podman-b3d5ba657b3dfbc2f33083cfd35b7baad12247f8.zip | |
Merge pull request #15216 from cevich/v4.2_image_search
[v4.2] Cirrus: Improve CI VM image updates for EC2
| -rw-r--r-- | .cirrus.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index b9c284002..4fbb7066e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,7 +6,7 @@ env: #### Global variables used for all tasks #### # Name of the ultimate destination branch for this CI run, PR or post-merge. - DEST_BRANCH: "main" + DEST_BRANCH: "v4.2" # Sane (default) value for GOPROXY and GOSUMDB. GOPROXY: "https://proxy.golang.org,direct" GOSUMDB: "sum.golang.org" @@ -32,12 +32,12 @@ env: # Image identifiers IMAGE_SUFFIX: "c6211193021923328" - FEDORA_AMI_ID: "ami-06a41d8a81ab56afa" - # Complete image names + # EC2 images + FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" + # GCP Images FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" - # Container FQIN's FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}" @@ -610,7 +610,7 @@ podman_machine_task: TEST_FLAVOR: "machine" PRIV_NAME: "rootless" # intended use-case DISTRO_NV: "${FEDORA_NAME}" - VM_IMAGE_NAME: "${FEDORA_AMI_ID}" + VM_IMAGE_NAME: "${FEDORA_AMI}" clone_script: *get_gosrc setup_script: *setup main_script: *main |