diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-04 03:17:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 03:17:34 -0400 |
| commit | 66d30e946d218e54259f0cb60307f8ab92300043 (patch) | |
| tree | a55d0996e4c4cb15ff4e7e3774b53abcdb2c0ff1 | |
| parent | d4394ea3688ad1942b8457f6df869f7c440d49e7 (diff) | |
| parent | d55c46f8c69f907a539b518cce91bd5c0127ab89 (diff) | |
| download | podman-66d30e946d218e54259f0cb60307f8ab92300043.tar.gz podman-66d30e946d218e54259f0cb60307f8ab92300043.tar.bz2 podman-66d30e946d218e54259f0cb60307f8ab92300043.zip | |
Merge pull request #13739 from cevich/fix_build_push
Fix multi-arch image build version-tag + allow testing in PRs
| -rw-r--r-- | .cirrus.yml | 16 | ||||
| -rwxr-xr-x | contrib/cirrus/cirrus_yaml_test.py | 3 |
2 files changed, 16 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index beb871c23..772843dd7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -38,7 +38,7 @@ env: UBUNTU_NAME: "ubuntu-2110" # Google-cloud VM Images - IMAGE_SUFFIX: "c6261670816251904" + IMAGE_SUFFIX: "c6464310661611520" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" @@ -741,7 +741,7 @@ upgrade_test_task: always: *logs_artifacts -image_build_task: +image_build_task: &image-build name: "Build multi-arch $CTXDIR" alias: image_build # Some of these container images take > 1h to build, limit @@ -774,6 +774,18 @@ image_build_task: - main.sh $CIRRUS_REPO_CLONE_URL $CTXDIR +test_image_build_task: + <<: *image-build + # Allow this to run inside a PR + only_if: $CI == $CI + # This takes a LONG time, only run when requested. N/B: Any task + # made to depend on this one will block FOREVER unless triggered. + trigger_type: manual + # Overwrite all 'env', don't push anything, just do the build. + env: + DRYRUN: 1 + + # This task is critical. It updates the "last-used by" timestamp stored # in metadata for all VM images. This mechanism functions in tandem with # an out-of-band pruning operation to remove disused VM images. diff --git a/contrib/cirrus/cirrus_yaml_test.py b/contrib/cirrus/cirrus_yaml_test.py index b424c3ee6..a7fff8d3f 100755 --- a/contrib/cirrus/cirrus_yaml_test.py +++ b/contrib/cirrus/cirrus_yaml_test.py @@ -26,7 +26,8 @@ class TestCaseBase(unittest.TestCase): class TestDependsOn(TestCaseBase): ALL_TASK_NAMES = None - SUCCESS_DEPS_EXCLUDE = set(['success', 'artifacts', 'release', 'release_test']) + SUCCESS_DEPS_EXCLUDE = set(['success', 'artifacts', + 'test_image_build', 'release', 'release_test']) def setUp(self): super().setUp() |