CI: block on runc jobs again

Now that we've got runc 1.3.3, which includes the fix that went into
1.3.2 for the flake we've been seeing, block on runc jobs again.

Signed-off-by: Nalin Dahyabhai <[email protected]>

Author: nalind

.cirrus.yml

@@ -224,6 +224,18 @@ integration_task:
             DISTRO_NV: "${DEBIAN_NAME}"
             IMAGE_NAME: "${DEBIAN_CACHE_IMAGE_NAME}"
             STORAGE_DRIVER: 'vfs'
+        - env:
+            DISTRO_NV: "${FEDORA_NAME}"
+            IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"
+            STORAGE_DRIVER: 'vfs'
+            BUILDAH_RUNTIME: runc
+            RUNTIME_N: " using runc"
+        - env:
+            DISTRO_NV: "${PRIOR_FEDORA_NAME}"
+            IMAGE_NAME: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
+            STORAGE_DRIVER: 'vfs'
+            BUILDAH_RUNTIME: runc
+            RUNTIME_N: " using runc"
         # OVERLAY
         - env:
             DISTRO_NV: "${FEDORA_NAME}"
@@ -246,6 +258,18 @@ integration_task:
             IMAGE_NAME: "${RAWHIDE_CACHE_IMAGE_NAME}"
             STORAGE_DRIVER: 'overlay'
             TEST_BUILD_TAGS: 'containers_image_sequoia'
+        - env:
+            DISTRO_NV: "${FEDORA_NAME}"
+            IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"
+            STORAGE_DRIVER: 'overlay'
+            BUILDAH_RUNTIME: runc
+            RUNTIME_N: " using runc"
+        - env:
+            DISTRO_NV: "${PRIOR_FEDORA_NAME}"
+            IMAGE_NAME: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
+            STORAGE_DRIVER: 'overlay'
+            BUILDAH_RUNTIME: runc
+            RUNTIME_N: " using runc"
 
     gce_instance: &integration_gce_instance
         image_name: "$IMAGE_NAME"
@@ -270,53 +294,6 @@ integration_task:
         package_versions_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh packages'
         golang_version_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh golang'
 
-non_blocking_integration_task:
-    name: "Integration $DISTRO_NV$RUNTIME_N w/ $STORAGE_DRIVER (non-blocking)"
-    alias: non_blocking_integration
-    skip: *not_build_docs
-    depends_on: *smoke_vendor
-
-    matrix:
-        # VFS
-        - env:
-            DISTRO_NV: "${FEDORA_NAME}"
-            IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"
-            STORAGE_DRIVER: 'vfs'
-            BUILDAH_RUNTIME: runc
-            RUNTIME_N: " using runc"
-        - env:
-            DISTRO_NV: "${PRIOR_FEDORA_NAME}"
-            IMAGE_NAME: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
-            STORAGE_DRIVER: 'vfs'
-            BUILDAH_RUNTIME: runc
-            RUNTIME_N: " using runc"
-        # OVERLAY
-        - env:
-            DISTRO_NV: "${FEDORA_NAME}"
-            IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"
-            STORAGE_DRIVER: 'overlay'
-            BUILDAH_RUNTIME: runc
-            RUNTIME_N: " using runc"
-        - env:
-            DISTRO_NV: "${PRIOR_FEDORA_NAME}"
-            IMAGE_NAME: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
-            STORAGE_DRIVER: 'overlay'
-            BUILDAH_RUNTIME: runc
-            RUNTIME_N: " using runc"
-
-    gce_instance:
-        <<: *integration_gce_instance
-
-    # Separate scripts for separate outputs, makes debugging easier.
-    setup_script: '${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
-    build_script: '${SCRIPT_BASE}/build.sh |& ${_TIMESTAMP}'
-    integration_test_script: '${SCRIPT_BASE}/test.sh integration |& ${_TIMESTAMP}'
-
-    binary_artifacts:
-        path: ./bin/*
-
-    always: *standardlogs
-
 integration_rootless_task:
     name: "Integration rootless $DISTRO_NV$RUNTIME_N w/ $STORAGE_DRIVER"
     alias: integration_rootless
@@ -345,28 +322,6 @@ integration_rootless_task:
             IMAGE_NAME: "${DEBIAN_CACHE_IMAGE_NAME}"
             STORAGE_DRIVER: 'overlay'
             PRIV_NAME: rootless
-
-    gce_instance:
-        <<: *integration_gce_instance
-
-    # Separate scripts for separate outputs, makes debugging easier.
-    setup_script: '${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
-    build_script: '${SCRIPT_BASE}/build.sh |& ${_TIMESTAMP}'
-    integration_test_script: '${SCRIPT_BASE}/test.sh integration |& ${_TIMESTAMP}'
-
-    binary_artifacts:
-        path: ./bin/*
-
-    always:
-        <<: *standardlogs
-
-non_blocking_integration_rootless_task:
-    name: "Integration rootless $DISTRO_NV$RUNTIME_N w/ $STORAGE_DRIVER (non-blocking)"
-    alias: non_blocking_integration_rootless
-    skip: *not_build_docs
-    depends_on: *smoke_vendor
-
-    matrix:
         - env:
             DISTRO_NV: "${FEDORA_NAME}"
             IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"