diff options
| author | Chris Evich <cevich@redhat.com> | 2019-06-03 14:47:16 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-06-06 15:33:01 -0400 |
| commit | ae16fa33d7ec7d52f357107e9350278a20af50a1 (patch) | |
| tree | c219ce6eb36d211f1455d342b6b3184894cb2ee6 /.cirrus.yml | |
| parent | c5c73794b4bdb13746d0cceeb2ed62583b2c46a2 (diff) | |
| download | podman-ae16fa33d7ec7d52f357107e9350278a20af50a1.tar.gz podman-ae16fa33d7ec7d52f357107e9350278a20af50a1.tar.bz2 podman-ae16fa33d7ec7d52f357107e9350278a20af50a1.zip | |
Cirrus: Minor cleanup of dependencies and docs
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 65be49cee..cc645e601 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -223,6 +223,9 @@ meta_task: depends_on: - "gating" + - "vendor" + - "varlink_api" + - "build_each_commit" container: image: "quay.io/libpod/imgts:latest" # see contrib/imgts @@ -253,8 +256,8 @@ testing_task: depends_on: - "gating" - - "varlink_api" - "vendor" + - "varlink_api" - "build_each_commit" # Only test build cache-images, if that's what's requested @@ -352,32 +355,6 @@ special_testing_in_podman_task: failed_audit_log_script: 'cat /var/log/audit/audit.log || cat /var/log/kern.log || echo "Uh oh, cat audit.log failed"' failed_journalctl_b_script: 'journalctl -b || echo "Uh oh, journalctl -b failed"' -# Because system tests are stored within the repository, it is sometimes -# necessary to execute them within a PR to validate changes. -optional_testing_task: - - depends_on: - - "gating" - - # Only run system tests in PRs (not on merge) if magic string is present - # in the PR description. Post-merge system testing is assumed to happen - # later from OS distribution's build systems. - only_if: >- - $CIRRUS_BRANCH != 'master' && - $CIRRUS_CHANGE_MESSAGE !=~ '.*\*\*\*\s*CIRRUS:\s*TEST\s*IMAGES\s*\*\*\*.*' && - $CIRRUS_CHANGE_MESSAGE =~ '.*\*\*\*\s*CIRRUS:\s*SYSTEM\s*TEST\s*\*\*\*.*' - - gce_instance: - matrix: - image_name: "${FEDORA_CACHE_IMAGE_NAME}" - #image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}" - image_name: "${UBUNTU_CACHE_IMAGE_NAME}" - - timeout_in: 60m - - setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' - system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}' - # Test building of new cache-images for future PR testing, in this PR. test_build_cache_images_task: @@ -508,12 +485,13 @@ success_task: depends_on: # ignores any dependent task conditions - "gating" - - "build_each_commit" - "vendor" - "varlink_api" + - "build_each_commit" + - "meta" - "testing" - - "special_testing" - - "optional_testing" + - "special_testing_rootless" + - "special_testing_in_podman" - "test_build_cache_images" - "verify_test_built_images" - "build_cache_images" |