summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-31 08:37:36 -0400
committerGitHub <noreply@github.com>2022-08-31 08:37:36 -0400
commit42f6094d6ec0f10eb758eaf4864a5d52f55e1c9d (patch)
treed40a6e251d8583b3c8a5296065a3f9d5c8c24538
parentb401ac2a75f36d1c32551936907b3b1df8ecb070 (diff)
parentc5e47c0ac8583cb159d2ed482e5b66608036687f (diff)
downloadpodman-42f6094d6ec0f10eb758eaf4864a5d52f55e1c9d.tar.gz
podman-42f6094d6ec0f10eb758eaf4864a5d52f55e1c9d.tar.bz2
podman-42f6094d6ec0f10eb758eaf4864a5d52f55e1c9d.zip
Merge pull request #15539 from cevich/ec2_imgts
[v4.2] [CI:DOCS] Cirrus: Update meta task for EC2
-rw-r--r--.cirrus.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 2a6fd2181..320cafb1b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -33,7 +33,7 @@ env:
# Image identifiers
IMAGE_SUFFIX: "c6211193021923328"
# EC2 images
- FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
+ FEDORA_AMI: "ami-06a41d8a81ab56afa"
# GCP Images
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
@@ -841,7 +841,7 @@ meta_task:
container:
cpu: 2
memory: 2
- image: quay.io/libpod/imgts:$IMAGE_SUFFIX
+ image: quay.io/libpod/imgts:latest
env:
# Space-separated list of images used by this repository state
IMGNAMES: >-
@@ -849,8 +849,10 @@ meta_task:
${PRIOR_FEDORA_CACHE_IMAGE_NAME}
${UBUNTU_CACHE_IMAGE_NAME}
build-push-${IMAGE_SUFFIX}
+ EC2IMGNAMES: ${FEDORA_AMI}
BUILDID: "${CIRRUS_BUILD_ID}"
REPOREF: "${CIRRUS_REPO_NAME}"
+ AWSINI: ENCRYPTED[21b2db557171b11eb5abdbccae593f48c9caeba86dfcc4d4ff109edee9b4656ab6720a110dadfcd51e88cc59a71cc7af]
GCPJSON: ENCRYPTED[3a198350077849c8df14b723c0f4c9fece9ebe6408d35982e7adf2105a33f8e0e166ed3ed614875a0887e1af2b8775f4]
GCPNAME: ENCRYPTED[2f9738ef295a706f66a13891b40e8eaa92a89e0e87faf8bed66c41eca72bf76cfd190a6f2d0e8444c631fdf15ed32ef6]
GCPPROJECT: libpod-218412