diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-26 14:55:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 14:55:12 +0200 |
| commit | b212daa92f3a596efa87b6ccaa097f70cd34bb10 (patch) | |
| tree | 11d945f47836e9aef2f83e2c461ff4da191b081c /.cirrus.yml | |
| parent | eca157fb54d860215695b8e1de8a10cd1c836772 (diff) | |
| parent | ac5ad9acbf93106b39505803d9ed230c8c87fea9 (diff) | |
| download | podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.tar.gz podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.tar.bz2 podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.zip | |
Merge pull request #3632 from cevich/small_cirrus_fixes
Small cirrus and image-build fixes
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index cd6bac265..78b00c879 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -40,11 +40,6 @@ env: #### base-images (pre-existing in GCE) #### BUILT_IMAGE_SUFFIX: "-${CIRRUS_REPO_NAME}-${CIRRUS_BUILD_ID}" - # Git commits to use while building dependencies into cache-images - FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554" - CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" - CONMON_COMMIT: "6f3572558b97bc60dd8f8c7f0807748e6ce2c440" - CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a" # Special image w/ nested-libvirt + tools for creating new cache and base images IMAGE_BUILDER_CACHE_IMAGE_NAME: "image-builder-image-1541772081" @@ -540,6 +535,9 @@ success_task: release_task: + # Never do this when building images + only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\*\*\*\s*CIRRUS:\s*TEST\s*IMAGES\s*\*\*\*.*' + # TODO: Uncomment both to not affect pass/fail status of entire job? # allow_failures: $CI == "true" # skip_notifications: $CI == "true" |