cirrus: some fixes

.cirrus.yml

@@ -6,7 +6,7 @@
     #### Global variables used for all tasks
     ####
     # Overrides default location (/tmp/cirrus) for repo clone
-    CIRRUS_WORKING_DIR: "/var/tmp/go/src/github.com/containers/storage"
+    CIRRUS_WORKING_DIR: "/var/tmp/go/src/github.com/containers/container-libs"
     # Shell used to execute all script commands
     CIRRUS_SHELL: "/bin/bash"
     # Automation script path relative to $CIRRUS_WORKING_DIR)
@@ -16,8 +16,9 @@
     CIRRUS_CLONE_DEPTH: 50
     DEST_BRANCH: "main"
     GOPATH: "/var/tmp/go"
-    SKOPEO_PATH: "/var/tmp/go/src/github.com/containers/skopeo"
     GOBIN: "${GOPATH}/bin"
+    GOCACHE: "${GOPATH}/cache"
+    SKOPEO_PATH: "/var/tmp/go/src/github.com/containers/skopeo"
     IMAGE_WORKING_DIR: "/var/tmp/go/src/github.com/containers/image"
 
 
@@ -63,7 +64,7 @@
 gce_instance:
     image_project: "${IMAGE_PROJECT}"
     zone: "us-central1-b"  # Required by Cirrus for the time being
-    cpu: 2
+    cpu: 4
     memory: "4Gb"
     disk: 200
     image_name: "${FEDORA_CACHE_IMAGE_NAME}"
@@ -89,7 +90,10 @@
 storage_fedora_testing_task: &fedora_testing
     <<: *linux_testing
     alias: storage_fedora_testing
-    skip: "!changesInclude('storage/**')"
+    only_if: &only_if_storage >-
+        $CIRRUS_PR == '' ||
+        changesInclude('.cirrus.yml', 'go.work', 'go.work.sum') ||
+        changesInclude('storage/**')
     name: &std_test_name "Storage: ${OS_NAME} ${TEST_DRIVER}"
     env:
         OS_NAME: "${FEDORA_NAME}"
@@ -115,7 +119,7 @@
     <<: *linux_testing
     alias: storage_debian_testing
     name: *std_test_name
-    skip: "!changesInclude('storage/**')"
+    only_if: *only_if_storage
     env:
         OS_NAME: "${DEBIAN_NAME}"
         VM_IMAGE: "${DEBIAN_CACHE_IMAGE_NAME}"
@@ -136,7 +140,7 @@
 storage_lint_task:
     alias: storage_lint
     name: "Storage: Lint"
-    skip: "!changesInclude('storage/**')"
+    only_if: *only_if_storage
 
     env:
         CIRRUS_WORKING_DIR: "/go/src/github.com/containers/storage"
@@ -186,11 +190,10 @@
 image_validate_task:
     alias: image_validate
     name: "Image: Validate"
-    skip: "!changesInclude('storage/**', 'image/**')"
-    # The git-validation tool doesn't work well on branch or tag push,
-    # under Cirrus-CI, due to challenges obtaining the starting commit ID.
-    # Only do validation for PRs.
-    only_if: $CIRRUS_PR != ''
+    only_if: &only_if_image >-
+        $CIRRUS_PR == '' ||
+        changesInclude('.cirrus.yml', 'go.work', 'go.work.sum') ||
+        changesInclude('storage/**', 'image/**')
     gce_instance: &fedora_vm
         image_project: libpod-218412
         zone: "us-central1-f"
@@ -217,8 +220,7 @@
 image_cross_task:
     alias: image_cross
     name: "Image: Cross"
-    skip: "!changesInclude('storage/**', 'image/**')"
-    only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
+    only_if: *only_if_image
     gce_instance: *fedora_vm
     env:
         HOME: "/root"  # default unset, needed by golangci-lint.
@@ -232,8 +234,7 @@
     alias: image_test
     depends_on:
         - image_validate
-    only_if: *not_docs
-    skip: "!changesInclude('storage/**', 'image/**')"
+    only_if: *only_if_image
     gce_instance: *fedora_vm
     env:
         HOME: "/root"  # default unset, needed by golangci-lint.
@@ -267,8 +268,7 @@
 #####
 image_test_skopeo_task:
     alias: image_test_skopeo
-    only_if: *not_docs
-    skip: "!changesInclude('storage/**', 'image/**')"
+    only_if: *only_if_image
     depends_on:
         - image_validate
     gce_instance: *fedora_vm
@@ -310,38 +310,18 @@
 
 common_testing_task:
     alias: common_testing
-    name: "Common: Test"  
-    skip: "!changesInclude('storage/**', 'image/**', 'common/**')"
-    container:
-        image: "${FEDORA_CONTAINER_FQIN}"
+    name: "Common: Test"
     modules_cache:
         fingerprint_script: cat common/go.sum
         folder: $GOPATH/pkg/mod
-    build_script: |
-      cd common
-      make vendor
     test_script: |
       cd common
       make build
       make build-cross
       make test
 
-storage_vendor_task:
-    alias: storage_vendor
-    name: "Vendor"
-    container:
-        image: golang
-    modules_cache:
-        fingerprint_script: cat storage/go.sum
-        folder: $GOPATH/pkg/mod
-    build_script: |
-      cd storage
-      make vendor
-    test_script: |
-      cd storage
-
 storage_cross_task:
-    skip: "!changesInclude('storage/**')"
+    only_if: *only_if_storage
     alias: storage_cross
     name: "Storage: Cross"
     container:
@@ -351,7 +331,7 @@
       make cross
 
 storage_gofix_task:
-    skip: "!changesInclude('storage/**')"
+    only_if: *only_if_storage
     alias: storage_gofix
     name: "Storage: gofix"
     container:
@@ -366,7 +346,7 @@
       git diff --diff-filter=M --exit-code -- . ":(exclude)*.crt" ":(exclude)*.key" ":(exclude)*.cert"
 
 storage_codespell_task:
-    skip: "!changesInclude('storage/**')"
+    only_if: *only_if_storage
     alias: storage_codespell
     name: "Storage: codespell"
     container:
@@ -380,7 +360,7 @@
 # Status aggregator for all tests.  This task simply ensures a defined
 # set of tasks all passed, and allows confirming that based on the status
 # of this task.
 success_task:
     alias: success
     # N/B: The prow merge-bot (tide) is sensitized to this exact name, DO NOT CHANGE IT.
     # Ref: https://github.com/openshift/release/pull/49820
@@ -390,7 +370,6 @@
         - storage_fedora_testing
         - storage_debian_testing
         - images_timestamp_update
-        - storage_vendor
         - storage_cross
         - storage_gofix
         - storage_codespell