bats tests - parallelize

.cirrus.yml

@@ -148,7 +148,7 @@
         path: ./bin/*
 
 
 unit_task:
     name: 'Unit tests w/ $STORAGE_DRIVER'
     alias: unit
     only_if: &not_build_docs >-
@@ -175,7 +175,7 @@
         path: ./bin/*
 
 
 conformance_task:
     name: 'Debian Conformance w/ $STORAGE_DRIVER'
     alias: conformance
     only_if: *not_build_docs
@@ -197,7 +197,7 @@
     conformance_test_script: '${SCRIPT_BASE}/test.sh conformance |& ${_TIMESTAMP}'
 
 
 integration_task:
     name: "Integration $DISTRO_NV w/ $STORAGE_DRIVER"
     alias: integration
     only_if: *not_build_docs
@@ -235,6 +235,7 @@
 
     gce_instance:
         image_name: "$IMAGE_NAME"
+        cpu: 4
 
     # Separate scripts for separate outputs, makes debugging easier.
     setup_script: '${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
@@ -254,7 +255,7 @@
         package_versions_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh packages'
         golang_version_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh golang'
 
 integration_rootless_task:
     name: "Integration rootless $DISTRO_NV w/ $STORAGE_DRIVER"
     alias: integration_rootless
     only_if: *not_build_docs
@@ -282,6 +283,7 @@
 
     gce_instance:
         image_name: "$IMAGE_NAME"
+        cpu: 4
 
     # Separate scripts for separate outputs, makes debugging easier.
     setup_script: '${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
@@ -294,7 +296,7 @@
     always:
         <<: *standardlogs
 
 in_podman_task:
     name: "Containerized Integration"
     alias: in_podman
     only_if: *not_build_docs
@@ -321,7 +323,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:
     # N/B: The prow merge-bot (tide) is sensitized to this exact name, DO NOT CHANGE IT.
     # Ref: https://github.com/openshift/release/pull/48909
     name: "Total Success"

tests/blobcache.bats

@@ -2,6 +2,12 @@
 
 load helpers
 
+# The 'rm cachefile' in the "blobs must be reused" test
+# causes flakes when parallelizing
+function setup_file() {
+    export BATS_NO_PARALLELIZE_WITHIN_FILE=true
+}
+
 @test "blobcache-pull" {
 	blobcachedir=${TEST_SCRATCH_DIR}/cache
 	mkdir -p ${blobcachedir}

tests/bud.bats

@@ -165,6 +165,7 @@ _EOF
   # Helper function. push our image with the given options, and run skopeo inspect
   function _test_buildah_push() {
     run_buildah push \
+                --log-level=debug \
                 $WITH_POLICY_JSON \
                 --authfile ${TEST_SCRATCH_DIR}/test.auth \
                 --tls-verify=false \

tests/mkcw.bats

@@ -22,6 +22,7 @@ function mkcw_check_image() {
 
   # Decrypt, mount, and take a look around.
   uuid=$(cryptsetup luksUUID "$mountpoint"/disk.img)
+  echo "# uuid=$uuid" >&3
   cryptsetup luksOpen --key-file "$TEST_SCRATCH_DIR"/key "$mountpoint"/disk.img "$uuid"
   mkdir -p "$TEST_SCRATCH_DIR"/mount
   mount /dev/mapper/"$uuid" "$TEST_SCRATCH_DIR"/mount

tests/source.bats

@@ -152,6 +152,4 @@ load helpers
   run diff -r $srcdir $pulldir
   # FIXME: if there's a nonzero chance of this failing, include actual diffs
   assert "$status" -eq 0 "status from diff of srcdir vs pulldir"
-
-  stop_registry
 }

tests/test_runner.sh

@@ -13,4 +13,4 @@ function execute() {
 }
 
 # Run the tests.
-execute time bats --tap "${@:-.}"
+execute time bats -j $(nproc) --tap "${@:-.}"