Skip to content

Commit

Permalink
DO NOT MERGE: testing
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Evich <[email protected]>
  • Loading branch information
cevich committed Mar 22, 2022
1 parent c27a35e commit 04a0dd0
Showing 1 changed file with 10 additions and 33 deletions.
43 changes: 10 additions & 33 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ image_builder_task:
name: "Image-builder image"
alias: "image_builder"
only_if: *is_pr
skip: &ci_docs_tooling |
$CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*' ||
$CIRRUS_CHANGE_TITLE =~ '.*CI:TOOLING.*'
skip: $CI == $CI
depends_on:
- validate
# Packer needs time to clean up partially created VM images
Expand All @@ -68,7 +66,7 @@ image_builder_task:
container_images_task: &container_images
alias: "container_images"
only_if: *is_pr
skip: *ci_docs_tooling
skip: $CI == $CI
depends_on:
- image_builder
timeout_in: 30m
Expand Down Expand Up @@ -110,7 +108,7 @@ tooling_images_task:
alias: tooling_images
name: 'Build Tooling images'
only_if: $CIRRUS_CRON == ''
skip: &ci_docs $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*'
skip: $CI == $CI
depends_on:
- validate
# TODO: This should not take this long, but it can :(
Expand All @@ -135,7 +133,6 @@ base_images_task:
name: "Build VM Base-images"
alias: "base_images"
only_if: *is_pr
skip: *ci_docs_tooling
depends_on:
- container_images
# Packer needs time to clean up partially created VM images
Expand All @@ -154,12 +151,6 @@ base_images_task:
name: "${PACKER_BUILDS} Base Image"
env:
PACKER_BUILDS: "fedora"
- <<: *base_image
env:
PACKER_BUILDS: "prior-fedora"
- <<: *base_image
env:
PACKER_BUILDS: "ubuntu"
env:
GAC_JSON: ENCRYPTED[7fba7fb26ab568ae39f799ab58a476123206576b0135b3d1019117c6d682391370c801e149f29324ff4b50133012aed9]
script: "ci/make_base_images.sh"
Expand All @@ -172,7 +163,6 @@ cache_images_task:
name: "Build VM Cache-images"
alias: "cache_images"
only_if: *is_pr
skip: *ci_docs_tooling
depends_on:
- base_images
# Packer needs time to clean up partially created VM images
Expand All @@ -188,21 +178,6 @@ cache_images_task:
matrix:
- &cache_image
name: "${PACKER_BUILDS} Cache Image"
env:
PACKER_BUILDS: "fedora"
- <<: *cache_image
env:
PACKER_BUILDS: "prior-fedora"
- <<: *cache_image
env:
PACKER_BUILDS: "fedora-netavark"
- <<: *cache_image
env:
PACKER_BUILDS: "fedora-podman-py"
- <<: *cache_image
env:
PACKER_BUILDS: "ubuntu"
- <<: *cache_image
env:
PACKER_BUILDS: "build-push"
env:
Expand All @@ -218,7 +193,7 @@ imgts_task:
name: "Apply new image metadata"
alias: imgts
only_if: *is_pr
skip: *ci_docs_tooling
skip: $CI == $CI
depends_on:
- cache_images
container:
Expand Down Expand Up @@ -250,7 +225,7 @@ test_imgobsolete_task: &lifecycle_test
name: "Test old images obsolete marking"
alias: test_imgobsolete
only_if: &not_cron $CIRRUS_CRON == ''
skip: *ci_docs
skip: $CI == $CI
depends_on:
- tooling_images
- imgts
Expand All @@ -271,7 +246,7 @@ test_imgprune_task:
<<: *lifecycle_test
name: "Test obsolete image deletion"
alias: test_imgprune
skip: *ci_docs
skip: $CI == $CI
depends_on:
- tooling_images
- imgts
Expand All @@ -283,7 +258,7 @@ test_gcsupld_task:
name: "Test uploading to GCS"
alias: test_gcsupld
only_if: *not_cron
skip: *ci_docs
skip: $CI == $CI
depends_on:
- tooling_images
- imgts
Expand All @@ -302,7 +277,7 @@ test_get_ci_vm_task:
name: "Test get_ci_vm entrypoint"
alias: test_get_ci_vm
only_if: *not_cron
skip: *ci_docs
skip: $CI == $CI
depends_on:
- tooling_images
- imgts
Expand Down Expand Up @@ -335,6 +310,7 @@ cron_imgobsolete_task: &lifecycle_cron
name: "Periodicly mark old images obsolete"
alias: cron_imgobsolete
only_if: $CIRRUS_PR == '' && $CIRRUS_CRON != ''
skip: $CI == $CI
container:
image: 'quay.io/libpod/imgobsolete:latest'
cpu: 2
Expand All @@ -349,6 +325,7 @@ cron_imgprune_task:
<<: *lifecycle_cron
name: "Periodicly delete obsolete images"
alias: cron_imgprune
skip: $CI == $CI
depends_on:
- cron_imgobsolete
container:
Expand Down

0 comments on commit 04a0dd0

Please sign in to comment.