From e37883f13e6f9e659a044eaa5dba46bab166e3a6 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Thu, 9 Sep 2021 14:09:34 -0400
Subject: Cirrus: NM/CNI workaround + Remove prior-Ubuntu
Ref: https://github.com/containers/automation_images/pull/88
Signed-off-by: Chris Evich <cevich@redhat.com>
---
.cirrus.yml | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
(limited to '.cirrus.yml')
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]
--
cgit v1.2.3-54-g00ecf
From fd56c838622ba78c3e19b3e0ce96d7dc2f6246f4 Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Wed, 15 Sep 2021 16:05:27 -0400
Subject: Set DEST_BRANCH in cirrus to fix CI
Signed-off-by: Matthew Heon <mheon@redhat.com>
---
.cirrus.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to '.cirrus.yml')
diff --git a/.cirrus.yml b/.cirrus.yml
index 581aaaa7b..4df2d3201 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: "v3.4"
# Overrides default location (/tmp/cirrus) for repo clone
GOPATH: &gopath "/var/tmp/go"
GOBIN: "${GOPATH}/bin"
--
cgit v1.2.3-54-g00ecf