diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-14 10:50:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 10:50:14 -0400 |
| commit | 20daae1de93c1a73f454f3f3ba04bba03a348f81 (patch) | |
| tree | 3f97946a879b22fa643039fb9a0fa68c737386a3 | |
| parent | 27ebae9e90d1d3e5a980a786c3ad525c14ebf0d9 (diff) | |
| parent | d30facfda804ed60d559bce61acf97f1d9a3f889 (diff) | |
| download | podman-20daae1de93c1a73f454f3f3ba04bba03a348f81.tar.gz podman-20daae1de93c1a73f454f3f3ba04bba03a348f81.tar.bz2 podman-20daae1de93c1a73f454f3f3ba04bba03a348f81.zip | |
Merge pull request #11512 from cevich/use_nmcli_workaround_images
Cirrus: NM/CNI workaround + Remove prior-Ubuntu
| -rw-r--r-- | .cirrus.yml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 7a9494b9c..581aaaa7b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,20 +27,17 @@ env: FEDORA_NAME: "fedora-34" PRIOR_FEDORA_NAME: "fedora-33" UBUNTU_NAME: "ubuntu-2104" - PRIOR_UBUNTU_NAME: "ubuntu-2010" # Google-cloud VM Images - IMAGE_SUFFIX: "c6737534580424704" + IMAGE_SUFFIX: "c6431352024203264" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" - PRIOR_UBUNTU_CACHE_IMAGE_NAME: "prior-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}" UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX}" - PRIOR_UBUNTU_CONTAINER_FQIN: "quay.io/libpod/prior-ubuntu_podman:${IMAGE_SUFFIX}" #### #### Control variables that determine what to run and how to run it. @@ -161,11 +158,6 @@ build_task: VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} CTR_FQIN: ${UBUNTU_CONTAINER_FQIN} _BUILD_CACHE_HANDLE: ${UBUNTU_NAME}-build-${CIRRUS_BUILD_ID} - - env: &priorubuntu_envvars - DISTRO_NV: ${PRIOR_UBUNTU_NAME} - VM_IMAGE_NAME: ${PRIOR_UBUNTU_CACHE_IMAGE_NAME} - CTR_FQIN: ${PRIOR_UBUNTU_CONTAINER_FQIN} - _BUILD_CACHE_HANDLE: ${PRIOR_UBUNTU_NAME}-build-${CIRRUS_BUILD_ID} env: TEST_FLAVOR: build # Ref: https://cirrus-ci.org/guide/writing-tasks/#cache-instruction @@ -408,7 +400,6 @@ unit_test_task: - env: *stdenvars - env: *priorfedora_envvars - env: *ubuntu_envvars - - env: *priorubuntu_envvars # Special-case: Rootless on latest Fedora (standard) VM - name: "Rootless unit on $DISTRO_NV" env: @@ -687,7 +678,6 @@ meta_task: ${FEDORA_CACHE_IMAGE_NAME} ${PRIOR_FEDORA_CACHE_IMAGE_NAME} ${UBUNTU_CACHE_IMAGE_NAME} - ${PRIOR_UBUNTU_CACHE_IMAGE_NAME} BUILDID: "${CIRRUS_BUILD_ID}" REPOREF: "${CIRRUS_REPO_NAME}" GCPJSON: ENCRYPTED[3a198350077849c8df14b723c0f4c9fece9ebe6408d35982e7adf2105a33f8e0e166ed3ed614875a0887e1af2b8775f4] |