Merge pull request #5824 from cevich/fix_dest_branch

Cirrus: Necessary changes for v1.9 branch automation

5 files changed, 15 insertions, 37 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index 01cecd5a8..388f73677 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -14,7 +14,7 @@ env:
     #### Global variables used for all tasks
     ####
     # Name of the ultimate destination branch for this CI run, PR or post-merge.
-    DEST_BRANCH: "master"
+    DEST_BRANCH: "v1.9"
     # Overrides default location (/tmp/cirrus) for repo clone
     GOPATH: "/var/tmp/go"
     GOBIN: "${GOPATH}/bin"
@@ -106,7 +106,7 @@ gating_task:
         # Note: Image has dual purpose, see contrib/gate/README.md
         # The entrypoint.sh script ensures a prestine copy of $SRCPATH is
         # available at $GOSRC before executing make instructions.
-        image: "quay.io/libpod/gate:master"
+        image: "quay.io/libpod/gate:v1.9"
         cpu: 8
         memory: 12
 
@@ -234,7 +234,7 @@ varlink_api_task:
     # Runs within Cirrus's "community cluster"
     container:
         # Note: Image has dual purpose, see contrib/gate/README.md
-        image: "quay.io/libpod/gate:master"
+        image: "quay.io/libpod/gate:v1.9"
         cpu: 4
         memory: 12
 
@@ -321,7 +321,7 @@ meta_task:
         - "build_without_cgo"
 
     container:
-        image: "quay.io/libpod/imgts:master"  # see contrib/imgts
+        image: "quay.io/libpod/imgts:v1.9"  # see contrib/imgts
         cpu: 1
         memory: 1
 
@@ -346,32 +346,6 @@ meta_task:
     script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/update_meta.sh |& ${TIMESTAMP}'
 
 
-# Remove old and disused images based on labels set by meta_task
-image_prune_task:
-
-    # This should ONLY ever run from the master branch, and never
-    # anywhere else so it's behavior is always consistent, even
-    # as new branches are created.
-    only_if: $CIRRUS_BRANCH == "master"
-
-    depends_on:
-        - "meta"
-
-    container:
-        image: "quay.io/libpod/imgprune:master"  # see contrib/imgprune
-        cpu: 1
-        memory: 1
-
-    env:
-        <<: *meta_env_vars
-        GCPJSON: ENCRYPTED[4c11d8e09c904c30fc70eecb95c73dec0ddf19976f9b981a0f80f3f6599e8f990bcef93c253ac0277f200850d98528e7]
-        GCPNAME: ENCRYPTED[7f54557ba6e5a437f11283a53e71baec9ca546f48a9835538cc54d297f79968eb1337d4596a1025b14f9d1c5723fbd29]
-
-    timeout_in: 10m
-
-    script: '/usr/local/bin/entrypoint.sh |& ${TIMESTAMP}'
-
-
 # This task does the unit and integration testing for every platform
 testing_task:
     alias: "testing"
@@ -766,7 +740,6 @@ success_task:
         - "build_each_commit"
         - "build_without_cgo"
         - "meta"
-        - "image_prune"
         - "testing"
         - "rpmbuild"
         - "special_testing_rootless"
@@ -785,7 +758,7 @@ success_task:
 
     container:
         # Note: Image has dual purpose, see contrib/gate/README.md
-        image: "quay.io/libpod/gate:master"
+        image: "quay.io/libpod/gate:v1.9"
         cpu: 1
         memory: 1
 
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 2031432b9..113551a10 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -50,7 +50,7 @@ fi
 # Defaults when not running under CI
 export CI="${CI:-false}"
 CIRRUS_CI="${CIRRUS_CI:-false}"
-DEST_BRANCH="${DEST_BRANCH:-master}"
+DEST_BRANCH="${DEST_BRANCH:-v1.9}"
 CONTINUOUS_INTEGRATION="${CONTINUOUS_INTEGRATION:-false}"
 CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-libpod}
 CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-unknown$(date +%s)}  # difficult to reliably discover
@@ -71,7 +71,7 @@ export BUILT_IMAGE_SUFFIX="${BUILT_IMAGE_SUFFIX:--$CIRRUS_REPO_NAME-${CIRRUS_BUI
 # IN_PODMAN container image
 IN_PODMAN_IMAGE="quay.io/libpod/in_podman:$DEST_BRANCH"
 # Image for uploading releases
-UPLDREL_IMAGE="quay.io/libpod/upldrel:master"
+UPLDREL_IMAGE="quay.io/libpod/upldrel:v1.9"
 
 # Avoid getting stuck waiting for user input
 export DEBIAN_FRONTEND="noninteractive"
diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter
index 6a86f6a49..738d2e19d 100755
--- a/contrib/cirrus/logformatter
+++ b/contrib/cirrus/logformatter
@@ -220,8 +220,8 @@ END_HTML
             $cirrus_task = $1;
         }
 
-        # BATS handling
-        if ($line =~ /^1\.\.\d+$/) {
+        # BATS handling (used also for apiv2 tests, which emit TAP output)
+        if ($line =~ /^1\.\.\d+$/ || $line =~ m!/test-apiv2!) {
             $looks_like_bats = 1;
         }
         if ($looks_like_bats) {
@@ -234,6 +234,10 @@ END_HTML
             elsif ($line =~ /^#\s/)            { $css = 'log'     }
 
             if ($css) {
+                # Make it linkable, e.g. foo.html#t--00001
+                if ($line =~ /^(not\s+)?ok\s+(\d+)/) {
+                    $line = sprintf("<a name='t--%05d'>%s</a>", $2, $line);
+                }
                 $line = "<span class='bats-$css'>$line</span>";
             }
 
diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile
index 54bd2cbde..4fddae557 100644
--- a/contrib/gate/Dockerfile
+++ b/contrib/gate/Dockerfile
@@ -21,6 +21,7 @@ RUN dnf -y install \
       procps-ng \
       python \
       python3-dateutil \
+      python3-pip \
       python3-psutil \
       python3-pytoml \
       python3-pyyaml \
diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2
index b101be012..1af76b4be 100755
--- a/test/apiv2/test-apiv2
+++ b/test/apiv2/test-apiv2
@@ -355,7 +355,7 @@ done
 
 if [ -n "$service_pid" ]; then
     kill $service_pid
-    wait -f $service_pid
+    wait $service_pid
 fi
 
 test_count=$(<$testcounter_file)