Merge pull request #3253 from cevich/clean_brent_mess

Cirrus: Minor cleanup of dependencies and docs

2 files changed, 8 insertions, 65 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"
diff --git a/contrib/cirrus/README.md b/contrib/cirrus/README.md
index 69d8653fe..94494a558 100644
--- a/contrib/cirrus/README.md
+++ b/contrib/cirrus/README.md
@@ -63,41 +63,6 @@ task (pass or fail) is set based on the exit status of the last script to execut
    Total execution time is capped at 2-hours (includes all the above)
    but this script normally completes in less than an hour.
 
-### ``special_testing`` Task
-
-This task exercises podman under specialized environments or conditions.
-The specific differences from the ``testing`` task depend upon the
-contents of the ``$SPECIALMODE`` environment variable.
-
-| Value     | Meaning                                                               |
-| rootless  | Setup a regular user to build/run integration tests.                  |
-| in_podman | Setup a container image, build/run integration tests inside container |
-
-***N/B: Steps below are performed by automation***
-
-1. After `gating` passes, spin up one VM per
-   `matrix: image_name` item.
-
-2. ``setup_environment.sh``: Mostly the same as
-   in ``testing`` task, then specialized depending on ``$SPECIALMODE``.
-
-3. Which tests and how they execute depends on ``$SPECIALMODE``.
-
-
-### ``optional_testing`` Task
-
-***N/B: Steps below are performed by automation***
-
-1. Optionally executes in parallel with ``testing``.  Requires
-    **prior** to job-start, the magic string ``***CIRRUS: SYSTEM TEST***``
-   is found in the pull-request *description*.  The *description* is the first
-   text-box under the main *summary* line in the github WebUI.
-
-2. ``setup_environment.sh``: Same as for other tasks.
-
-3. ``system_test.sh``: Build both dependencies and libpod, install them,
-   then execute `make localsystem` from the repository root.
-
 
 ### ``test_build_cache_images_task`` Task