diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-09 17:08:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 17:08:08 +0000 |
| commit | c33dc90ace724f920c14e41769ce237f5c5d14ec (patch) | |
| tree | f2f8faff4949b17431171e24c17b0816f05ac73b | |
| parent | 097cc6eb6dd8e598c0e8676d21267b4edb11e144 (diff) | |
| parent | d2d7898b8a829ffd4638ba0243affd14c66eb05c (diff) | |
| download | podman-c33dc90ace724f920c14e41769ce237f5c5d14ec.tar.gz podman-c33dc90ace724f920c14e41769ce237f5c5d14ec.tar.bz2 podman-c33dc90ace724f920c14e41769ce237f5c5d14ec.zip | |
Merge pull request #15215 from cevich/use_image_search
Cirrus: Improve CI VM image updates for EC2
| -rw-r--r-- | .cirrus.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index f951eda42..f94ee2f3b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -34,13 +34,13 @@ env: # Image identifiers IMAGE_SUFFIX: "c5495735033528320" - FEDORA_AMI_ID: "ami-0df5df528071f1052" # matches c5495735033528320 - FEDORA_AARCH64_AMI_ID: "ami-02ee8b3a782a78791" # matches c5495735033528320 - # Complete image names + # EC2 images + FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" + FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${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}" @@ -210,7 +210,7 @@ build_aarch64_task: env: &stdenvars_aarch64 EC2_INST_TYPE: "t4g.xlarge" DISTRO_NV: ${FEDORA_AARCH64_NAME} - VM_IMAGE_NAME: ${FEDORA_AARCH64_AMI_ID} + VM_IMAGE_NAME: ${FEDORA_AARCH64_AMI} CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CI_DESIRED_RUNTIME: crun TEST_FLAVOR: build @@ -701,7 +701,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 |