Clean up workflow warnings

By using a more precise condition for when to upload logs after tests run

6 files changed, 971 insertions, 509 deletions

diff --git a/.github/workflows/test-erlang-otp-22.3.yaml b/.github/workflows/test-erlang-otp-22.3.yaml
index 3a16acb11e..0062677bf4 100644
--- a/.github/workflows/test-erlang-otp-22.3.yaml
+++ b/.github/workflows/test-erlang-otp-22.3.yaml
@@ -625,6 +625,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-amqqueue_backward_compatibility
+      id: tests
       run: |
         mkdir ct-amqqueue_backward_compatibility-logs && chmod 777 ct-amqqueue_backward_compatibility-logs
         docker run \
@@ -637,11 +638,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-amqqueue_backward_compatibility-logs
         path: ct-amqqueue_backward_compatibility-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-amqqueue_backward_compatibility [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-amqqueue_backward_compatibility-logs-v3.7.28 && chmod 777 ct-amqqueue_backward_compatibility-logs-v3.7.28
         docker run \
@@ -655,11 +657,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-amqqueue_backward_compatibility-logs-mixed-v3.7.28
         path: ct-amqqueue_backward_compatibility-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-amqqueue_backward_compatibility [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-amqqueue_backward_compatibility-logs-v3.8.9 && chmod 777 ct-amqqueue_backward_compatibility-logs-v3.8.9
         docker run \
@@ -673,7 +676,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-amqqueue_backward_compatibility-logs-mixed-v3.8.9
         path: ct-amqqueue_backward_compatibility-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -697,6 +700,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-backing_queue
+      id: tests
       run: |
         mkdir ct-backing_queue-logs && chmod 777 ct-backing_queue-logs
         docker run \
@@ -709,11 +713,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-backing_queue-logs
         path: ct-backing_queue-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-backing_queue [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-backing_queue-logs-v3.7.28 && chmod 777 ct-backing_queue-logs-v3.7.28
         docker run \
@@ -727,11 +732,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-backing_queue-logs-mixed-v3.7.28
         path: ct-backing_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-backing_queue [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-backing_queue-logs-v3.8.9 && chmod 777 ct-backing_queue-logs-v3.8.9
         docker run \
@@ -745,7 +751,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-backing_queue-logs-mixed-v3.8.9
         path: ct-backing_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -769,6 +775,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-channel_interceptor
+      id: tests
       run: |
         mkdir ct-channel_interceptor-logs && chmod 777 ct-channel_interceptor-logs
         docker run \
@@ -781,11 +788,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-channel_interceptor-logs
         path: ct-channel_interceptor-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-channel_interceptor [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-channel_interceptor-logs-v3.7.28 && chmod 777 ct-channel_interceptor-logs-v3.7.28
         docker run \
@@ -799,11 +807,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-channel_interceptor-logs-mixed-v3.7.28
         path: ct-channel_interceptor-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-channel_interceptor [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-channel_interceptor-logs-v3.8.9 && chmod 777 ct-channel_interceptor-logs-v3.8.9
         docker run \
@@ -817,7 +826,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-channel_interceptor-logs-mixed-v3.8.9
         path: ct-channel_interceptor-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -841,6 +850,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-channel_operation_timeout
+      id: tests
       run: |
         mkdir ct-channel_operation_timeout-logs && chmod 777 ct-channel_operation_timeout-logs
         docker run \
@@ -853,11 +863,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-channel_operation_timeout-logs
         path: ct-channel_operation_timeout-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-channel_operation_timeout [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-channel_operation_timeout-logs-v3.7.28 && chmod 777 ct-channel_operation_timeout-logs-v3.7.28
         docker run \
@@ -871,11 +882,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-channel_operation_timeout-logs-mixed-v3.7.28
         path: ct-channel_operation_timeout-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-channel_operation_timeout [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-channel_operation_timeout-logs-v3.8.9 && chmod 777 ct-channel_operation_timeout-logs-v3.8.9
         docker run \
@@ -889,7 +901,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-channel_operation_timeout-logs-mixed-v3.8.9
         path: ct-channel_operation_timeout-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -913,6 +925,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-cluster
+      id: tests
       run: |
         mkdir ct-cluster-logs && chmod 777 ct-cluster-logs
         docker run \
@@ -925,11 +938,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-cluster-logs
         path: ct-cluster-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-cluster [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-cluster-logs-v3.7.28 && chmod 777 ct-cluster-logs-v3.7.28
         docker run \
@@ -943,11 +957,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-cluster-logs-mixed-v3.7.28
         path: ct-cluster-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-cluster [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-cluster-logs-v3.8.9 && chmod 777 ct-cluster-logs-v3.8.9
         docker run \
@@ -961,7 +976,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-cluster-logs-mixed-v3.8.9
         path: ct-cluster-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -985,6 +1000,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-cluster_rename
+      id: tests
       run: |
         mkdir ct-cluster_rename-logs && chmod 777 ct-cluster_rename-logs
         docker run \
@@ -997,11 +1013,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-cluster_rename-logs
         path: ct-cluster_rename-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-cluster_rename [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-cluster_rename-logs-v3.7.28 && chmod 777 ct-cluster_rename-logs-v3.7.28
         docker run \
@@ -1015,11 +1032,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-cluster_rename-logs-mixed-v3.7.28
         path: ct-cluster_rename-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-cluster_rename [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-cluster_rename-logs-v3.8.9 && chmod 777 ct-cluster_rename-logs-v3.8.9
         docker run \
@@ -1033,7 +1051,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-cluster_rename-logs-mixed-v3.8.9
         path: ct-cluster_rename-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1057,6 +1075,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-clustering_management
+      id: tests
       run: |
         mkdir ct-clustering_management-logs && chmod 777 ct-clustering_management-logs
         docker run \
@@ -1069,11 +1088,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-clustering_management-logs
         path: ct-clustering_management-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-clustering_management [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-clustering_management-logs-v3.7.28 && chmod 777 ct-clustering_management-logs-v3.7.28
         docker run \
@@ -1087,11 +1107,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-clustering_management-logs-mixed-v3.7.28
         path: ct-clustering_management-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-clustering_management [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-clustering_management-logs-v3.8.9 && chmod 777 ct-clustering_management-logs-v3.8.9
         docker run \
@@ -1105,7 +1126,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-clustering_management-logs-mixed-v3.8.9
         path: ct-clustering_management-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1129,6 +1150,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-config_schema
+      id: tests
       run: |
         mkdir ct-config_schema-logs && chmod 777 ct-config_schema-logs
         docker run \
@@ -1141,11 +1163,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-config_schema-logs
         path: ct-config_schema-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-config_schema [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-config_schema-logs-v3.7.28 && chmod 777 ct-config_schema-logs-v3.7.28
         docker run \
@@ -1159,11 +1182,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-config_schema-logs-mixed-v3.7.28
         path: ct-config_schema-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-config_schema [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-config_schema-logs-v3.8.9 && chmod 777 ct-config_schema-logs-v3.8.9
         docker run \
@@ -1177,7 +1201,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-config_schema-logs-mixed-v3.8.9
         path: ct-config_schema-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1201,6 +1225,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-confirms_rejects
+      id: tests
       run: |
         mkdir ct-confirms_rejects-logs && chmod 777 ct-confirms_rejects-logs
         docker run \
@@ -1213,11 +1238,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-confirms_rejects-logs
         path: ct-confirms_rejects-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-confirms_rejects [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-confirms_rejects-logs-v3.7.28 && chmod 777 ct-confirms_rejects-logs-v3.7.28
         docker run \
@@ -1231,11 +1257,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-confirms_rejects-logs-mixed-v3.7.28
         path: ct-confirms_rejects-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-confirms_rejects [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-confirms_rejects-logs-v3.8.9 && chmod 777 ct-confirms_rejects-logs-v3.8.9
         docker run \
@@ -1249,7 +1276,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-confirms_rejects-logs-mixed-v3.8.9
         path: ct-confirms_rejects-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1273,6 +1300,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-consumer_timeout
+      id: tests
       run: |
         mkdir ct-consumer_timeout-logs && chmod 777 ct-consumer_timeout-logs
         docker run \
@@ -1285,11 +1313,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-consumer_timeout-logs
         path: ct-consumer_timeout-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-consumer_timeout [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-consumer_timeout-logs-v3.7.28 && chmod 777 ct-consumer_timeout-logs-v3.7.28
         docker run \
@@ -1303,11 +1332,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-consumer_timeout-logs-mixed-v3.7.28
         path: ct-consumer_timeout-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-consumer_timeout [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-consumer_timeout-logs-v3.8.9 && chmod 777 ct-consumer_timeout-logs-v3.8.9
         docker run \
@@ -1321,7 +1351,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-consumer_timeout-logs-mixed-v3.8.9
         path: ct-consumer_timeout-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1345,6 +1375,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-crashing_queues
+      id: tests
       run: |
         mkdir ct-crashing_queues-logs && chmod 777 ct-crashing_queues-logs
         docker run \
@@ -1357,11 +1388,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-crashing_queues-logs
         path: ct-crashing_queues-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-crashing_queues [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-crashing_queues-logs-v3.7.28 && chmod 777 ct-crashing_queues-logs-v3.7.28
         docker run \
@@ -1375,11 +1407,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-crashing_queues-logs-mixed-v3.7.28
         path: ct-crashing_queues-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-crashing_queues [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-crashing_queues-logs-v3.8.9 && chmod 777 ct-crashing_queues-logs-v3.8.9
         docker run \
@@ -1393,7 +1426,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-crashing_queues-logs-mixed-v3.8.9
         path: ct-crashing_queues-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1417,6 +1450,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-dead_lettering
+      id: tests
       run: |
         mkdir ct-dead_lettering-logs && chmod 777 ct-dead_lettering-logs
         docker run \
@@ -1429,11 +1463,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dead_lettering-logs
         path: ct-dead_lettering-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-dead_lettering [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-dead_lettering-logs-v3.7.28 && chmod 777 ct-dead_lettering-logs-v3.7.28
         docker run \
@@ -1447,11 +1482,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-dead_lettering-logs-mixed-v3.7.28
         path: ct-dead_lettering-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-dead_lettering [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-dead_lettering-logs-v3.8.9 && chmod 777 ct-dead_lettering-logs-v3.8.9
         docker run \
@@ -1465,7 +1501,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-dead_lettering-logs-mixed-v3.8.9
         path: ct-dead_lettering-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1489,6 +1525,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-definition_import
+      id: tests
       run: |
         mkdir ct-definition_import-logs && chmod 777 ct-definition_import-logs
         docker run \
@@ -1501,11 +1538,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-definition_import-logs
         path: ct-definition_import-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-definition_import [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-definition_import-logs-v3.7.28 && chmod 777 ct-definition_import-logs-v3.7.28
         docker run \
@@ -1519,11 +1557,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-definition_import-logs-mixed-v3.7.28
         path: ct-definition_import-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-definition_import [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-definition_import-logs-v3.8.9 && chmod 777 ct-definition_import-logs-v3.8.9
         docker run \
@@ -1537,7 +1576,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-definition_import-logs-mixed-v3.8.9
         path: ct-definition_import-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1561,6 +1600,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-disconnect_detected_during_alarm
+      id: tests
       run: |
         mkdir ct-disconnect_detected_during_alarm-logs && chmod 777 ct-disconnect_detected_during_alarm-logs
         docker run \
@@ -1573,11 +1613,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-disconnect_detected_during_alarm-logs
         path: ct-disconnect_detected_during_alarm-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-disconnect_detected_during_alarm [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-disconnect_detected_during_alarm-logs-v3.7.28 && chmod 777 ct-disconnect_detected_during_alarm-logs-v3.7.28
         docker run \
@@ -1591,11 +1632,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-disconnect_detected_during_alarm-logs-mixed-v3.7.28
         path: ct-disconnect_detected_during_alarm-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-disconnect_detected_during_alarm [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-disconnect_detected_during_alarm-logs-v3.8.9 && chmod 777 ct-disconnect_detected_during_alarm-logs-v3.8.9
         docker run \
@@ -1609,7 +1651,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-disconnect_detected_during_alarm-logs-mixed-v3.8.9
         path: ct-disconnect_detected_during_alarm-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1633,6 +1675,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-dynamic_ha
+      id: tests
       run: |
         mkdir ct-dynamic_ha-logs && chmod 777 ct-dynamic_ha-logs
         docker run \
@@ -1645,11 +1688,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_ha-logs
         path: ct-dynamic_ha-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-dynamic_ha [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-dynamic_ha-logs-v3.7.28 && chmod 777 ct-dynamic_ha-logs-v3.7.28
         docker run \
@@ -1663,11 +1707,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_ha-logs-mixed-v3.7.28
         path: ct-dynamic_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-dynamic_ha [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-dynamic_ha-logs-v3.8.9 && chmod 777 ct-dynamic_ha-logs-v3.8.9
         docker run \
@@ -1681,7 +1726,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_ha-logs-mixed-v3.8.9
         path: ct-dynamic_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1705,6 +1750,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-dynamic_qq
+      id: tests
       run: |
         mkdir ct-dynamic_qq-logs && chmod 777 ct-dynamic_qq-logs
         docker run \
@@ -1717,11 +1763,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_qq-logs
         path: ct-dynamic_qq-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-dynamic_qq [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-dynamic_qq-logs-v3.7.28 && chmod 777 ct-dynamic_qq-logs-v3.7.28
         docker run \
@@ -1735,11 +1782,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_qq-logs-mixed-v3.7.28
         path: ct-dynamic_qq-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-dynamic_qq [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-dynamic_qq-logs-v3.8.9 && chmod 777 ct-dynamic_qq-logs-v3.8.9
         docker run \
@@ -1753,7 +1801,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_qq-logs-mixed-v3.8.9
         path: ct-dynamic_qq-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1777,6 +1825,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-eager_sync
+      id: tests
       run: |
         mkdir ct-eager_sync-logs && chmod 777 ct-eager_sync-logs
         docker run \
@@ -1789,11 +1838,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-eager_sync-logs
         path: ct-eager_sync-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-eager_sync [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-eager_sync-logs-v3.7.28 && chmod 777 ct-eager_sync-logs-v3.7.28
         docker run \
@@ -1807,11 +1857,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-eager_sync-logs-mixed-v3.7.28
         path: ct-eager_sync-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-eager_sync [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-eager_sync-logs-v3.8.9 && chmod 777 ct-eager_sync-logs-v3.8.9
         docker run \
@@ -1825,7 +1876,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-eager_sync-logs-mixed-v3.8.9
         path: ct-eager_sync-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1849,6 +1900,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-feature_flags
+      id: tests
       run: |
         mkdir ct-feature_flags-logs && chmod 777 ct-feature_flags-logs
         docker run \
@@ -1861,11 +1913,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-feature_flags-logs
         path: ct-feature_flags-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-feature_flags [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-feature_flags-logs-v3.7.28 && chmod 777 ct-feature_flags-logs-v3.7.28
         docker run \
@@ -1879,11 +1932,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-feature_flags-logs-mixed-v3.7.28
         path: ct-feature_flags-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-feature_flags [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-feature_flags-logs-v3.8.9 && chmod 777 ct-feature_flags-logs-v3.8.9
         docker run \
@@ -1897,7 +1951,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-feature_flags-logs-mixed-v3.8.9
         path: ct-feature_flags-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1921,6 +1975,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-lazy_queue
+      id: tests
       run: |
         mkdir ct-lazy_queue-logs && chmod 777 ct-lazy_queue-logs
         docker run \
@@ -1933,11 +1988,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-lazy_queue-logs
         path: ct-lazy_queue-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-lazy_queue [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-lazy_queue-logs-v3.7.28 && chmod 777 ct-lazy_queue-logs-v3.7.28
         docker run \
@@ -1951,11 +2007,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-lazy_queue-logs-mixed-v3.7.28
         path: ct-lazy_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-lazy_queue [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-lazy_queue-logs-v3.8.9 && chmod 777 ct-lazy_queue-logs-v3.8.9
         docker run \
@@ -1969,7 +2026,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-lazy_queue-logs-mixed-v3.8.9
         path: ct-lazy_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -1993,6 +2050,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-list_consumers_sanity_check
+      id: tests
       run: |
         mkdir ct-list_consumers_sanity_check-logs && chmod 777 ct-list_consumers_sanity_check-logs
         docker run \
@@ -2005,11 +2063,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-list_consumers_sanity_check-logs
         path: ct-list_consumers_sanity_check-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-list_consumers_sanity_check [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-list_consumers_sanity_check-logs-v3.7.28 && chmod 777 ct-list_consumers_sanity_check-logs-v3.7.28
         docker run \
@@ -2023,11 +2082,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-list_consumers_sanity_check-logs-mixed-v3.7.28
         path: ct-list_consumers_sanity_check-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-list_consumers_sanity_check [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-list_consumers_sanity_check-logs-v3.8.9 && chmod 777 ct-list_consumers_sanity_check-logs-v3.8.9
         docker run \
@@ -2041,7 +2101,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-list_consumers_sanity_check-logs-mixed-v3.8.9
         path: ct-list_consumers_sanity_check-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2065,6 +2125,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-list_queues_online_and_offline
+      id: tests
       run: |
         mkdir ct-list_queues_online_and_offline-logs && chmod 777 ct-list_queues_online_and_offline-logs
         docker run \
@@ -2077,11 +2138,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-list_queues_online_and_offline-logs
         path: ct-list_queues_online_and_offline-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-list_queues_online_and_offline [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-list_queues_online_and_offline-logs-v3.7.28 && chmod 777 ct-list_queues_online_and_offline-logs-v3.7.28
         docker run \
@@ -2095,11 +2157,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-list_queues_online_and_offline-logs-mixed-v3.7.28
         path: ct-list_queues_online_and_offline-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-list_queues_online_and_offline [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-list_queues_online_and_offline-logs-v3.8.9 && chmod 777 ct-list_queues_online_and_offline-logs-v3.8.9
         docker run \
@@ -2113,7 +2176,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-list_queues_online_and_offline-logs-mixed-v3.8.9
         path: ct-list_queues_online_and_offline-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2137,6 +2200,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-maintenance_mode
+      id: tests
       run: |
         mkdir ct-maintenance_mode-logs && chmod 777 ct-maintenance_mode-logs
         docker run \
@@ -2149,11 +2213,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-maintenance_mode-logs
         path: ct-maintenance_mode-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-maintenance_mode [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-maintenance_mode-logs-v3.7.28 && chmod 777 ct-maintenance_mode-logs-v3.7.28
         docker run \
@@ -2167,11 +2232,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-maintenance_mode-logs-mixed-v3.7.28
         path: ct-maintenance_mode-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-maintenance_mode [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-maintenance_mode-logs-v3.8.9 && chmod 777 ct-maintenance_mode-logs-v3.8.9
         docker run \
@@ -2185,7 +2251,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-maintenance_mode-logs-mixed-v3.8.9
         path: ct-maintenance_mode-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2209,6 +2275,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-many_node_ha
+      id: tests
       run: |
         mkdir ct-many_node_ha-logs && chmod 777 ct-many_node_ha-logs
         docker run \
@@ -2221,11 +2288,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-many_node_ha-logs
         path: ct-many_node_ha-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-many_node_ha [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-many_node_ha-logs-v3.7.28 && chmod 777 ct-many_node_ha-logs-v3.7.28
         docker run \
@@ -2239,11 +2307,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-many_node_ha-logs-mixed-v3.7.28
         path: ct-many_node_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-many_node_ha [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-many_node_ha-logs-v3.8.9 && chmod 777 ct-many_node_ha-logs-v3.8.9
         docker run \
@@ -2257,7 +2326,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-many_node_ha-logs-mixed-v3.8.9
         path: ct-many_node_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2281,6 +2350,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-message_size_limit
+      id: tests
       run: |
         mkdir ct-message_size_limit-logs && chmod 777 ct-message_size_limit-logs
         docker run \
@@ -2293,11 +2363,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-message_size_limit-logs
         path: ct-message_size_limit-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-message_size_limit [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-message_size_limit-logs-v3.7.28 && chmod 777 ct-message_size_limit-logs-v3.7.28
         docker run \
@@ -2311,11 +2382,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-message_size_limit-logs-mixed-v3.7.28
         path: ct-message_size_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-message_size_limit [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-message_size_limit-logs-v3.8.9 && chmod 777 ct-message_size_limit-logs-v3.8.9
         docker run \
@@ -2329,7 +2401,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-message_size_limit-logs-mixed-v3.8.9
         path: ct-message_size_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2353,6 +2425,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-metrics
+      id: tests
       run: |
         mkdir ct-metrics-logs && chmod 777 ct-metrics-logs
         docker run \
@@ -2365,11 +2438,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-metrics-logs
         path: ct-metrics-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-metrics [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-metrics-logs-v3.7.28 && chmod 777 ct-metrics-logs-v3.7.28
         docker run \
@@ -2383,11 +2457,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-metrics-logs-mixed-v3.7.28
         path: ct-metrics-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-metrics [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-metrics-logs-v3.8.9 && chmod 777 ct-metrics-logs-v3.8.9
         docker run \
@@ -2401,7 +2476,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-metrics-logs-mixed-v3.8.9
         path: ct-metrics-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2425,6 +2500,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-mirrored_supervisor
+      id: tests
       run: |
         mkdir ct-mirrored_supervisor-logs && chmod 777 ct-mirrored_supervisor-logs
         docker run \
@@ -2437,11 +2513,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-mirrored_supervisor-logs
         path: ct-mirrored_supervisor-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-mirrored_supervisor [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-mirrored_supervisor-logs-v3.7.28 && chmod 777 ct-mirrored_supervisor-logs-v3.7.28
         docker run \
@@ -2455,11 +2532,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-mirrored_supervisor-logs-mixed-v3.7.28
         path: ct-mirrored_supervisor-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-mirrored_supervisor [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-mirrored_supervisor-logs-v3.8.9 && chmod 777 ct-mirrored_supervisor-logs-v3.8.9
         docker run \
@@ -2473,7 +2551,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-mirrored_supervisor-logs-mixed-v3.8.9
         path: ct-mirrored_supervisor-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2497,6 +2575,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-msg_store
+      id: tests
       run: |
         mkdir ct-msg_store-logs && chmod 777 ct-msg_store-logs
         docker run \
@@ -2509,11 +2588,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-msg_store-logs
         path: ct-msg_store-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-msg_store [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-msg_store-logs-v3.7.28 && chmod 777 ct-msg_store-logs-v3.7.28
         docker run \
@@ -2527,11 +2607,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-msg_store-logs-mixed-v3.7.28
         path: ct-msg_store-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-msg_store [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-msg_store-logs-v3.8.9 && chmod 777 ct-msg_store-logs-v3.8.9
         docker run \
@@ -2545,7 +2626,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-msg_store-logs-mixed-v3.8.9
         path: ct-msg_store-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2569,6 +2650,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-peer_discovery_classic_config
+      id: tests
       run: |
         mkdir ct-peer_discovery_classic_config-logs && chmod 777 ct-peer_discovery_classic_config-logs
         docker run \
@@ -2581,11 +2663,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_classic_config-logs
         path: ct-peer_discovery_classic_config-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-peer_discovery_classic_config [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-peer_discovery_classic_config-logs-v3.7.28 && chmod 777 ct-peer_discovery_classic_config-logs-v3.7.28
         docker run \
@@ -2599,11 +2682,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_classic_config-logs-mixed-v3.7.28
         path: ct-peer_discovery_classic_config-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-peer_discovery_classic_config [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-peer_discovery_classic_config-logs-v3.8.9 && chmod 777 ct-peer_discovery_classic_config-logs-v3.8.9
         docker run \
@@ -2617,7 +2701,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_classic_config-logs-mixed-v3.8.9
         path: ct-peer_discovery_classic_config-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2641,6 +2725,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-peer_discovery_dns
+      id: tests
       run: |
         mkdir ct-peer_discovery_dns-logs && chmod 777 ct-peer_discovery_dns-logs
         docker run \
@@ -2653,11 +2738,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_dns-logs
         path: ct-peer_discovery_dns-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-peer_discovery_dns [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-peer_discovery_dns-logs-v3.7.28 && chmod 777 ct-peer_discovery_dns-logs-v3.7.28
         docker run \
@@ -2671,11 +2757,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_dns-logs-mixed-v3.7.28
         path: ct-peer_discovery_dns-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-peer_discovery_dns [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-peer_discovery_dns-logs-v3.8.9 && chmod 777 ct-peer_discovery_dns-logs-v3.8.9
         docker run \
@@ -2689,7 +2776,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_dns-logs-mixed-v3.8.9
         path: ct-peer_discovery_dns-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2713,6 +2800,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_limit
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_limit-logs && chmod 777 ct-per_user_connection_channel_limit-logs
         docker run \
@@ -2725,11 +2813,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit-logs
         path: ct-per_user_connection_channel_limit-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-per_user_connection_channel_limit [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-per_user_connection_channel_limit-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_limit-logs-v3.7.28
         docker run \
@@ -2743,11 +2832,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit-logs-mixed-v3.7.28
         path: ct-per_user_connection_channel_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-per_user_connection_channel_limit [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-per_user_connection_channel_limit-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_limit-logs-v3.8.9
         docker run \
@@ -2761,7 +2851,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit-logs-mixed-v3.8.9
         path: ct-per_user_connection_channel_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2785,6 +2875,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_limit_partitions
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_limit_partitions-logs && chmod 777 ct-per_user_connection_channel_limit_partitions-logs
         docker run \
@@ -2797,11 +2888,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit_partitions-logs
         path: ct-per_user_connection_channel_limit_partitions-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-per_user_connection_channel_limit_partitions [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-per_user_connection_channel_limit_partitions-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_limit_partitions-logs-v3.7.28
         docker run \
@@ -2815,11 +2907,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit_partitions-logs-mixed-v3.7.28
         path: ct-per_user_connection_channel_limit_partitions-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-per_user_connection_channel_limit_partitions [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-per_user_connection_channel_limit_partitions-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_limit_partitions-logs-v3.8.9
         docker run \
@@ -2833,7 +2926,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit_partitions-logs-mixed-v3.8.9
         path: ct-per_user_connection_channel_limit_partitions-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2857,6 +2950,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_tracking
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_tracking-logs && chmod 777 ct-per_user_connection_channel_tracking-logs
         docker run \
@@ -2869,11 +2963,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_tracking-logs
         path: ct-per_user_connection_channel_tracking-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-per_user_connection_channel_tracking [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-per_user_connection_channel_tracking-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_tracking-logs-v3.7.28
         docker run \
@@ -2887,11 +2982,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_tracking-logs-mixed-v3.7.28
         path: ct-per_user_connection_channel_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-per_user_connection_channel_tracking [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-per_user_connection_channel_tracking-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_tracking-logs-v3.8.9
         docker run \
@@ -2905,7 +3001,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_tracking-logs-mixed-v3.8.9
         path: ct-per_user_connection_channel_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -2929,6 +3025,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_tracking
+      id: tests
       run: |
         mkdir ct-per_user_connection_tracking-logs && chmod 777 ct-per_user_connection_tracking-logs
         docker run \
@@ -2941,11 +3038,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_tracking-logs
         path: ct-per_user_connection_tracking-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-per_user_connection_tracking [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-per_user_connection_tracking-logs-v3.7.28 && chmod 777 ct-per_user_connection_tracking-logs-v3.7.28
         docker run \
@@ -2959,11 +3057,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_tracking-logs-mixed-v3.7.28
         path: ct-per_user_connection_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-per_user_connection_tracking [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-per_user_connection_tracking-logs-v3.8.9 && chmod 777 ct-per_user_connection_tracking-logs-v3.8.9
         docker run \
@@ -2977,7 +3076,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_tracking-logs-mixed-v3.8.9
         path: ct-per_user_connection_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3001,6 +3100,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_connection_limit
+      id: tests
       run: |
         mkdir ct-per_vhost_connection_limit-logs && chmod 777 ct-per_vhost_connection_limit-logs
         docker run \
@@ -3013,11 +3113,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit-logs
         path: ct-per_vhost_connection_limit-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-per_vhost_connection_limit [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-per_vhost_connection_limit-logs-v3.7.28 && chmod 777 ct-per_vhost_connection_limit-logs-v3.7.28
         docker run \
@@ -3031,11 +3132,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit-logs-mixed-v3.7.28
         path: ct-per_vhost_connection_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-per_vhost_connection_limit [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-per_vhost_connection_limit-logs-v3.8.9 && chmod 777 ct-per_vhost_connection_limit-logs-v3.8.9
         docker run \
@@ -3049,7 +3151,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit-logs-mixed-v3.8.9
         path: ct-per_vhost_connection_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3073,6 +3175,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_connection_limit_partitions
+      id: tests
       run: |
         mkdir ct-per_vhost_connection_limit_partitions-logs && chmod 777 ct-per_vhost_connection_limit_partitions-logs
         docker run \
@@ -3085,11 +3188,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit_partitions-logs
         path: ct-per_vhost_connection_limit_partitions-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-per_vhost_connection_limit_partitions [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-per_vhost_connection_limit_partitions-logs-v3.7.28 && chmod 777 ct-per_vhost_connection_limit_partitions-logs-v3.7.28
         docker run \
@@ -3103,11 +3207,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit_partitions-logs-mixed-v3.7.28
         path: ct-per_vhost_connection_limit_partitions-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-per_vhost_connection_limit_partitions [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-per_vhost_connection_limit_partitions-logs-v3.8.9 && chmod 777 ct-per_vhost_connection_limit_partitions-logs-v3.8.9
         docker run \
@@ -3121,7 +3226,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit_partitions-logs-mixed-v3.8.9
         path: ct-per_vhost_connection_limit_partitions-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3145,6 +3250,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_msg_store
+      id: tests
       run: |
         mkdir ct-per_vhost_msg_store-logs && chmod 777 ct-per_vhost_msg_store-logs
         docker run \
@@ -3157,11 +3263,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_msg_store-logs
         path: ct-per_vhost_msg_store-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-per_vhost_msg_store [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-per_vhost_msg_store-logs-v3.7.28 && chmod 777 ct-per_vhost_msg_store-logs-v3.7.28
         docker run \
@@ -3175,11 +3282,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_msg_store-logs-mixed-v3.7.28
         path: ct-per_vhost_msg_store-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-per_vhost_msg_store [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-per_vhost_msg_store-logs-v3.8.9 && chmod 777 ct-per_vhost_msg_store-logs-v3.8.9
         docker run \
@@ -3193,7 +3301,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_msg_store-logs-mixed-v3.8.9
         path: ct-per_vhost_msg_store-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3217,6 +3325,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_queue_limit
+      id: tests
       run: |
         mkdir ct-per_vhost_queue_limit-logs && chmod 777 ct-per_vhost_queue_limit-logs
         docker run \
@@ -3229,11 +3338,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_queue_limit-logs
         path: ct-per_vhost_queue_limit-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-per_vhost_queue_limit [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-per_vhost_queue_limit-logs-v3.7.28 && chmod 777 ct-per_vhost_queue_limit-logs-v3.7.28
         docker run \
@@ -3247,11 +3357,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_queue_limit-logs-mixed-v3.7.28
         path: ct-per_vhost_queue_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-per_vhost_queue_limit [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-per_vhost_queue_limit-logs-v3.8.9 && chmod 777 ct-per_vhost_queue_limit-logs-v3.8.9
         docker run \
@@ -3265,7 +3376,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_queue_limit-logs-mixed-v3.8.9
         path: ct-per_vhost_queue_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3289,6 +3400,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-policy
+      id: tests
       run: |
         mkdir ct-policy-logs && chmod 777 ct-policy-logs
         docker run \
@@ -3301,11 +3413,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-policy-logs
         path: ct-policy-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-policy [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-policy-logs-v3.7.28 && chmod 777 ct-policy-logs-v3.7.28
         docker run \
@@ -3319,11 +3432,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-policy-logs-mixed-v3.7.28
         path: ct-policy-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-policy [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-policy-logs-v3.8.9 && chmod 777 ct-policy-logs-v3.8.9
         docker run \
@@ -3337,7 +3451,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-policy-logs-mixed-v3.8.9
         path: ct-policy-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3361,6 +3475,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-priority_queue
+      id: tests
       run: |
         mkdir ct-priority_queue-logs && chmod 777 ct-priority_queue-logs
         docker run \
@@ -3373,11 +3488,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue-logs
         path: ct-priority_queue-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-priority_queue [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-priority_queue-logs-v3.7.28 && chmod 777 ct-priority_queue-logs-v3.7.28
         docker run \
@@ -3391,11 +3507,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue-logs-mixed-v3.7.28
         path: ct-priority_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-priority_queue [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-priority_queue-logs-v3.8.9 && chmod 777 ct-priority_queue-logs-v3.8.9
         docker run \
@@ -3409,7 +3526,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue-logs-mixed-v3.8.9
         path: ct-priority_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3433,6 +3550,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-priority_queue_recovery
+      id: tests
       run: |
         mkdir ct-priority_queue_recovery-logs && chmod 777 ct-priority_queue_recovery-logs
         docker run \
@@ -3445,11 +3563,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue_recovery-logs
         path: ct-priority_queue_recovery-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-priority_queue_recovery [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-priority_queue_recovery-logs-v3.7.28 && chmod 777 ct-priority_queue_recovery-logs-v3.7.28
         docker run \
@@ -3463,11 +3582,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue_recovery-logs-mixed-v3.7.28
         path: ct-priority_queue_recovery-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-priority_queue_recovery [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-priority_queue_recovery-logs-v3.8.9 && chmod 777 ct-priority_queue_recovery-logs-v3.8.9
         docker run \
@@ -3481,7 +3601,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue_recovery-logs-mixed-v3.8.9
         path: ct-priority_queue_recovery-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3505,6 +3625,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-product_info
+      id: tests
       run: |
         mkdir ct-product_info-logs && chmod 777 ct-product_info-logs
         docker run \
@@ -3517,11 +3638,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-product_info-logs
         path: ct-product_info-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-product_info [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-product_info-logs-v3.7.28 && chmod 777 ct-product_info-logs-v3.7.28
         docker run \
@@ -3535,11 +3657,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-product_info-logs-mixed-v3.7.28
         path: ct-product_info-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-product_info [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-product_info-logs-v3.8.9 && chmod 777 ct-product_info-logs-v3.8.9
         docker run \
@@ -3553,7 +3676,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-product_info-logs-mixed-v3.8.9
         path: ct-product_info-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3577,6 +3700,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-proxy_protocol
+      id: tests
       run: |
         mkdir ct-proxy_protocol-logs && chmod 777 ct-proxy_protocol-logs
         docker run \
@@ -3589,11 +3713,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-proxy_protocol-logs
         path: ct-proxy_protocol-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-proxy_protocol [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-proxy_protocol-logs-v3.7.28 && chmod 777 ct-proxy_protocol-logs-v3.7.28
         docker run \
@@ -3607,11 +3732,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-proxy_protocol-logs-mixed-v3.7.28
         path: ct-proxy_protocol-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-proxy_protocol [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-proxy_protocol-logs-v3.8.9 && chmod 777 ct-proxy_protocol-logs-v3.8.9
         docker run \
@@ -3625,7 +3751,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-proxy_protocol-logs-mixed-v3.8.9
         path: ct-proxy_protocol-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3649,6 +3775,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-publisher_confirms_parallel
+      id: tests
       run: |
         mkdir ct-publisher_confirms_parallel-logs && chmod 777 ct-publisher_confirms_parallel-logs
         docker run \
@@ -3661,11 +3788,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-publisher_confirms_parallel-logs
         path: ct-publisher_confirms_parallel-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-publisher_confirms_parallel [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-publisher_confirms_parallel-logs-v3.7.28 && chmod 777 ct-publisher_confirms_parallel-logs-v3.7.28
         docker run \
@@ -3679,11 +3807,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-publisher_confirms_parallel-logs-mixed-v3.7.28
         path: ct-publisher_confirms_parallel-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-publisher_confirms_parallel [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-publisher_confirms_parallel-logs-v3.8.9 && chmod 777 ct-publisher_confirms_parallel-logs-v3.8.9
         docker run \
@@ -3697,7 +3826,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-publisher_confirms_parallel-logs-mixed-v3.8.9
         path: ct-publisher_confirms_parallel-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3721,6 +3850,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_length_limits
+      id: tests
       run: |
         mkdir ct-queue_length_limits-logs && chmod 777 ct-queue_length_limits-logs
         docker run \
@@ -3733,11 +3863,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_length_limits-logs
         path: ct-queue_length_limits-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-queue_length_limits [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-queue_length_limits-logs-v3.7.28 && chmod 777 ct-queue_length_limits-logs-v3.7.28
         docker run \
@@ -3751,11 +3882,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-queue_length_limits-logs-mixed-v3.7.28
         path: ct-queue_length_limits-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-queue_length_limits [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-queue_length_limits-logs-v3.8.9 && chmod 777 ct-queue_length_limits-logs-v3.8.9
         docker run \
@@ -3769,7 +3901,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-queue_length_limits-logs-mixed-v3.8.9
         path: ct-queue_length_limits-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3793,6 +3925,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_master_location
+      id: tests
       run: |
         mkdir ct-queue_master_location-logs && chmod 777 ct-queue_master_location-logs
         docker run \
@@ -3805,11 +3938,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_master_location-logs
         path: ct-queue_master_location-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-queue_master_location [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-queue_master_location-logs-v3.7.28 && chmod 777 ct-queue_master_location-logs-v3.7.28
         docker run \
@@ -3823,11 +3957,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-queue_master_location-logs-mixed-v3.7.28
         path: ct-queue_master_location-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-queue_master_location [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-queue_master_location-logs-v3.8.9 && chmod 777 ct-queue_master_location-logs-v3.8.9
         docker run \
@@ -3841,7 +3976,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-queue_master_location-logs-mixed-v3.8.9
         path: ct-queue_master_location-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3865,6 +4000,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_parallel
+      id: tests
       run: |
         mkdir ct-queue_parallel-logs && chmod 777 ct-queue_parallel-logs
         docker run \
@@ -3877,11 +4013,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_parallel-logs
         path: ct-queue_parallel-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-queue_parallel [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-queue_parallel-logs-v3.7.28 && chmod 777 ct-queue_parallel-logs-v3.7.28
         docker run \
@@ -3895,11 +4032,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-queue_parallel-logs-mixed-v3.7.28
         path: ct-queue_parallel-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-queue_parallel [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-queue_parallel-logs-v3.8.9 && chmod 777 ct-queue_parallel-logs-v3.8.9
         docker run \
@@ -3913,7 +4051,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-queue_parallel-logs-mixed-v3.8.9
         path: ct-queue_parallel-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -3937,6 +4075,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_type
+      id: tests
       run: |
         mkdir ct-queue_type-logs && chmod 777 ct-queue_type-logs
         docker run \
@@ -3949,11 +4088,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_type-logs
         path: ct-queue_type-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-queue_type [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-queue_type-logs-v3.7.28 && chmod 777 ct-queue_type-logs-v3.7.28
         docker run \
@@ -3967,11 +4107,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-queue_type-logs-mixed-v3.7.28
         path: ct-queue_type-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-queue_type [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-queue_type-logs-v3.8.9 && chmod 777 ct-queue_type-logs-v3.8.9
         docker run \
@@ -3985,7 +4126,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-queue_type-logs-mixed-v3.8.9
         path: ct-queue_type-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4009,6 +4150,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-quorum_queue
+      id: tests
       run: |
         mkdir ct-quorum_queue-logs && chmod 777 ct-quorum_queue-logs
         docker run \
@@ -4021,11 +4163,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-quorum_queue-logs
         path: ct-quorum_queue-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-quorum_queue [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-quorum_queue-logs-v3.7.28 && chmod 777 ct-quorum_queue-logs-v3.7.28
         docker run \
@@ -4039,11 +4182,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-quorum_queue-logs-mixed-v3.7.28
         path: ct-quorum_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-quorum_queue [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-quorum_queue-logs-v3.8.9 && chmod 777 ct-quorum_queue-logs-v3.8.9
         docker run \
@@ -4057,7 +4201,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-quorum_queue-logs-mixed-v3.8.9
         path: ct-quorum_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4081,6 +4225,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_confirms
+      id: tests
       run: |
         mkdir ct-rabbit_confirms-logs && chmod 777 ct-rabbit_confirms-logs
         docker run \
@@ -4093,11 +4238,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_confirms-logs
         path: ct-rabbit_confirms-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_confirms [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbit_confirms-logs-v3.7.28 && chmod 777 ct-rabbit_confirms-logs-v3.7.28
         docker run \
@@ -4111,11 +4257,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_confirms-logs-mixed-v3.7.28
         path: ct-rabbit_confirms-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_confirms [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbit_confirms-logs-v3.8.9 && chmod 777 ct-rabbit_confirms-logs-v3.8.9
         docker run \
@@ -4129,7 +4276,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_confirms-logs-mixed-v3.8.9
         path: ct-rabbit_confirms-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4153,6 +4300,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_core_metrics_gc
+      id: tests
       run: |
         mkdir ct-rabbit_core_metrics_gc-logs && chmod 777 ct-rabbit_core_metrics_gc-logs
         docker run \
@@ -4165,11 +4313,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_core_metrics_gc-logs
         path: ct-rabbit_core_metrics_gc-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_core_metrics_gc [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbit_core_metrics_gc-logs-v3.7.28 && chmod 777 ct-rabbit_core_metrics_gc-logs-v3.7.28
         docker run \
@@ -4183,11 +4332,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_core_metrics_gc-logs-mixed-v3.7.28
         path: ct-rabbit_core_metrics_gc-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_core_metrics_gc [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbit_core_metrics_gc-logs-v3.8.9 && chmod 777 ct-rabbit_core_metrics_gc-logs-v3.8.9
         docker run \
@@ -4201,7 +4351,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_core_metrics_gc-logs-mixed-v3.8.9
         path: ct-rabbit_core_metrics_gc-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4225,6 +4375,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo
+      id: tests
       run: |
         mkdir ct-rabbit_fifo-logs && chmod 777 ct-rabbit_fifo-logs
         docker run \
@@ -4237,11 +4388,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo-logs
         path: ct-rabbit_fifo-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_fifo [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbit_fifo-logs-v3.7.28 && chmod 777 ct-rabbit_fifo-logs-v3.7.28
         docker run \
@@ -4255,11 +4407,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo-logs-mixed-v3.7.28
         path: ct-rabbit_fifo-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_fifo [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbit_fifo-logs-v3.8.9 && chmod 777 ct-rabbit_fifo-logs-v3.8.9
         docker run \
@@ -4273,7 +4426,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo-logs-mixed-v3.8.9
         path: ct-rabbit_fifo-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4297,6 +4450,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_int
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_int-logs && chmod 777 ct-rabbit_fifo_int-logs
         docker run \
@@ -4309,11 +4463,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_int-logs
         path: ct-rabbit_fifo_int-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_fifo_int [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbit_fifo_int-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_int-logs-v3.7.28
         docker run \
@@ -4327,11 +4482,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_int-logs-mixed-v3.7.28
         path: ct-rabbit_fifo_int-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_fifo_int [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbit_fifo_int-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_int-logs-v3.8.9
         docker run \
@@ -4345,7 +4501,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_int-logs-mixed-v3.8.9
         path: ct-rabbit_fifo_int-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4369,6 +4525,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_prop
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_prop-logs && chmod 777 ct-rabbit_fifo_prop-logs
         docker run \
@@ -4381,11 +4538,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_prop-logs
         path: ct-rabbit_fifo_prop-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_fifo_prop [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbit_fifo_prop-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_prop-logs-v3.7.28
         docker run \
@@ -4399,11 +4557,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_prop-logs-mixed-v3.7.28
         path: ct-rabbit_fifo_prop-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_fifo_prop [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbit_fifo_prop-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_prop-logs-v3.8.9
         docker run \
@@ -4417,7 +4576,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_prop-logs-mixed-v3.8.9
         path: ct-rabbit_fifo_prop-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4441,6 +4600,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_v0
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_v0-logs && chmod 777 ct-rabbit_fifo_v0-logs
         docker run \
@@ -4453,11 +4613,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_v0-logs
         path: ct-rabbit_fifo_v0-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_fifo_v0 [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbit_fifo_v0-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_v0-logs-v3.7.28
         docker run \
@@ -4471,11 +4632,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_v0-logs-mixed-v3.7.28
         path: ct-rabbit_fifo_v0-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_fifo_v0 [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbit_fifo_v0-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_v0-logs-v3.8.9
         docker run \
@@ -4489,7 +4651,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_v0-logs-mixed-v3.8.9
         path: ct-rabbit_fifo_v0-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4513,6 +4675,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_msg_record
+      id: tests
       run: |
         mkdir ct-rabbit_msg_record-logs && chmod 777 ct-rabbit_msg_record-logs
         docker run \
@@ -4525,11 +4688,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_msg_record-logs
         path: ct-rabbit_msg_record-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_msg_record [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbit_msg_record-logs-v3.7.28 && chmod 777 ct-rabbit_msg_record-logs-v3.7.28
         docker run \
@@ -4543,11 +4707,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_msg_record-logs-mixed-v3.7.28
         path: ct-rabbit_msg_record-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_msg_record [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbit_msg_record-logs-v3.8.9 && chmod 777 ct-rabbit_msg_record-logs-v3.8.9
         docker run \
@@ -4561,7 +4726,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_msg_record-logs-mixed-v3.8.9
         path: ct-rabbit_msg_record-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4585,6 +4750,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_stream_queue
+      id: tests
       run: |
         mkdir ct-rabbit_stream_queue-logs && chmod 777 ct-rabbit_stream_queue-logs
         docker run \
@@ -4597,11 +4763,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_stream_queue-logs
         path: ct-rabbit_stream_queue-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_stream_queue [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbit_stream_queue-logs-v3.7.28 && chmod 777 ct-rabbit_stream_queue-logs-v3.7.28
         docker run \
@@ -4615,11 +4782,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_stream_queue-logs-mixed-v3.7.28
         path: ct-rabbit_stream_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbit_stream_queue [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbit_stream_queue-logs-v3.8.9 && chmod 777 ct-rabbit_stream_queue-logs-v3.8.9
         docker run \
@@ -4633,7 +4801,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_stream_queue-logs-mixed-v3.8.9
         path: ct-rabbit_stream_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4657,6 +4825,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmq_queues_cli_integration
+      id: tests
       run: |
         mkdir ct-rabbitmq_queues_cli_integration-logs && chmod 777 ct-rabbitmq_queues_cli_integration-logs
         docker run \
@@ -4669,11 +4838,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmq_queues_cli_integration-logs
         path: ct-rabbitmq_queues_cli_integration-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbitmq_queues_cli_integration [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbitmq_queues_cli_integration-logs-v3.7.28 && chmod 777 ct-rabbitmq_queues_cli_integration-logs-v3.7.28
         docker run \
@@ -4687,11 +4857,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmq_queues_cli_integration-logs-mixed-v3.7.28
         path: ct-rabbitmq_queues_cli_integration-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbitmq_queues_cli_integration [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbitmq_queues_cli_integration-logs-v3.8.9 && chmod 777 ct-rabbitmq_queues_cli_integration-logs-v3.8.9
         docker run \
@@ -4705,7 +4876,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmq_queues_cli_integration-logs-mixed-v3.8.9
         path: ct-rabbitmq_queues_cli_integration-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4729,6 +4900,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmqctl_integration
+      id: tests
       run: |
         mkdir ct-rabbitmqctl_integration-logs && chmod 777 ct-rabbitmqctl_integration-logs
         docker run \
@@ -4741,11 +4913,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_integration-logs
         path: ct-rabbitmqctl_integration-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbitmqctl_integration [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbitmqctl_integration-logs-v3.7.28 && chmod 777 ct-rabbitmqctl_integration-logs-v3.7.28
         docker run \
@@ -4759,11 +4932,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_integration-logs-mixed-v3.7.28
         path: ct-rabbitmqctl_integration-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbitmqctl_integration [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbitmqctl_integration-logs-v3.8.9 && chmod 777 ct-rabbitmqctl_integration-logs-v3.8.9
         docker run \
@@ -4777,7 +4951,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_integration-logs-mixed-v3.8.9
         path: ct-rabbitmqctl_integration-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4801,6 +4975,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmqctl_shutdown
+      id: tests
       run: |
         mkdir ct-rabbitmqctl_shutdown-logs && chmod 777 ct-rabbitmqctl_shutdown-logs
         docker run \
@@ -4813,11 +4988,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_shutdown-logs
         path: ct-rabbitmqctl_shutdown-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbitmqctl_shutdown [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-rabbitmqctl_shutdown-logs-v3.7.28 && chmod 777 ct-rabbitmqctl_shutdown-logs-v3.7.28
         docker run \
@@ -4831,11 +5007,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_shutdown-logs-mixed-v3.7.28
         path: ct-rabbitmqctl_shutdown-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-rabbitmqctl_shutdown [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-rabbitmqctl_shutdown-logs-v3.8.9 && chmod 777 ct-rabbitmqctl_shutdown-logs-v3.8.9
         docker run \
@@ -4849,7 +5026,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_shutdown-logs-mixed-v3.8.9
         path: ct-rabbitmqctl_shutdown-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4873,6 +5050,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-signal_handling
+      id: tests
       run: |
         mkdir ct-signal_handling-logs && chmod 777 ct-signal_handling-logs
         docker run \
@@ -4885,11 +5063,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-signal_handling-logs
         path: ct-signal_handling-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-signal_handling [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-signal_handling-logs-v3.7.28 && chmod 777 ct-signal_handling-logs-v3.7.28
         docker run \
@@ -4903,11 +5082,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-signal_handling-logs-mixed-v3.7.28
         path: ct-signal_handling-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-signal_handling [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-signal_handling-logs-v3.8.9 && chmod 777 ct-signal_handling-logs-v3.8.9
         docker run \
@@ -4921,7 +5101,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-signal_handling-logs-mixed-v3.8.9
         path: ct-signal_handling-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -4945,6 +5125,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-simple_ha
+      id: tests
       run: |
         mkdir ct-simple_ha-logs && chmod 777 ct-simple_ha-logs
         docker run \
@@ -4957,11 +5138,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-simple_ha-logs
         path: ct-simple_ha-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-simple_ha [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-simple_ha-logs-v3.7.28 && chmod 777 ct-simple_ha-logs-v3.7.28
         docker run \
@@ -4975,11 +5157,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-simple_ha-logs-mixed-v3.7.28
         path: ct-simple_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-simple_ha [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-simple_ha-logs-v3.8.9 && chmod 777 ct-simple_ha-logs-v3.8.9
         docker run \
@@ -4993,7 +5176,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-simple_ha-logs-mixed-v3.8.9
         path: ct-simple_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5017,6 +5200,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-single_active_consumer
+      id: tests
       run: |
         mkdir ct-single_active_consumer-logs && chmod 777 ct-single_active_consumer-logs
         docker run \
@@ -5029,11 +5213,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-single_active_consumer-logs
         path: ct-single_active_consumer-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-single_active_consumer [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-single_active_consumer-logs-v3.7.28 && chmod 777 ct-single_active_consumer-logs-v3.7.28
         docker run \
@@ -5047,11 +5232,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-single_active_consumer-logs-mixed-v3.7.28
         path: ct-single_active_consumer-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-single_active_consumer [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-single_active_consumer-logs-v3.8.9 && chmod 777 ct-single_active_consumer-logs-v3.8.9
         docker run \
@@ -5065,7 +5251,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-single_active_consumer-logs-mixed-v3.8.9
         path: ct-single_active_consumer-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5089,6 +5275,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-sync_detection
+      id: tests
       run: |
         mkdir ct-sync_detection-logs && chmod 777 ct-sync_detection-logs
         docker run \
@@ -5101,11 +5288,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-sync_detection-logs
         path: ct-sync_detection-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-sync_detection [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-sync_detection-logs-v3.7.28 && chmod 777 ct-sync_detection-logs-v3.7.28
         docker run \
@@ -5119,11 +5307,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-sync_detection-logs-mixed-v3.7.28
         path: ct-sync_detection-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-sync_detection [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-sync_detection-logs-v3.8.9 && chmod 777 ct-sync_detection-logs-v3.8.9
         docker run \
@@ -5137,7 +5326,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-sync_detection-logs-mixed-v3.8.9
         path: ct-sync_detection-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5161,6 +5350,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-term_to_binary_compat_prop
+      id: tests
       run: |
         mkdir ct-term_to_binary_compat_prop-logs && chmod 777 ct-term_to_binary_compat_prop-logs
         docker run \
@@ -5173,11 +5363,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-term_to_binary_compat_prop-logs
         path: ct-term_to_binary_compat_prop-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-term_to_binary_compat_prop [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-term_to_binary_compat_prop-logs-v3.7.28 && chmod 777 ct-term_to_binary_compat_prop-logs-v3.7.28
         docker run \
@@ -5191,11 +5382,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-term_to_binary_compat_prop-logs-mixed-v3.7.28
         path: ct-term_to_binary_compat_prop-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-term_to_binary_compat_prop [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-term_to_binary_compat_prop-logs-v3.8.9 && chmod 777 ct-term_to_binary_compat_prop-logs-v3.8.9
         docker run \
@@ -5209,7 +5401,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-term_to_binary_compat_prop-logs-mixed-v3.8.9
         path: ct-term_to_binary_compat_prop-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5233,6 +5425,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-topic_permission
+      id: tests
       run: |
         mkdir ct-topic_permission-logs && chmod 777 ct-topic_permission-logs
         docker run \
@@ -5245,11 +5438,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-topic_permission-logs
         path: ct-topic_permission-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-topic_permission [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-topic_permission-logs-v3.7.28 && chmod 777 ct-topic_permission-logs-v3.7.28
         docker run \
@@ -5263,11 +5457,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-topic_permission-logs-mixed-v3.7.28
         path: ct-topic_permission-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-topic_permission [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-topic_permission-logs-v3.8.9 && chmod 777 ct-topic_permission-logs-v3.8.9
         docker run \
@@ -5281,7 +5476,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-topic_permission-logs-mixed-v3.8.9
         path: ct-topic_permission-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5305,6 +5500,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control
+      id: tests
       run: |
         mkdir ct-unit_access_control-logs && chmod 777 ct-unit_access_control-logs
         docker run \
@@ -5317,11 +5513,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control-logs
         path: ct-unit_access_control-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_access_control [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_access_control-logs-v3.7.28 && chmod 777 ct-unit_access_control-logs-v3.7.28
         docker run \
@@ -5335,11 +5532,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control-logs-mixed-v3.7.28
         path: ct-unit_access_control-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_access_control [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_access_control-logs-v3.8.9 && chmod 777 ct-unit_access_control-logs-v3.8.9
         docker run \
@@ -5353,7 +5551,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control-logs-mixed-v3.8.9
         path: ct-unit_access_control-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5377,6 +5575,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control_authn_authz_context_propagation
+      id: tests
       run: |
         mkdir ct-unit_access_control_authn_authz_context_propagation-logs && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs
         docker run \
@@ -5389,11 +5588,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs
         path: ct-unit_access_control_authn_authz_context_propagation-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_access_control_authn_authz_context_propagation [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28 && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28
         docker run \
@@ -5407,11 +5607,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs-mixed-v3.7.28
         path: ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_access_control_authn_authz_context_propagation [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9 && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9
         docker run \
@@ -5425,7 +5626,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs-mixed-v3.8.9
         path: ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5449,6 +5650,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control_credential_validation
+      id: tests
       run: |
         mkdir ct-unit_access_control_credential_validation-logs && chmod 777 ct-unit_access_control_credential_validation-logs
         docker run \
@@ -5461,11 +5663,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_credential_validation-logs
         path: ct-unit_access_control_credential_validation-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_access_control_credential_validation [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_access_control_credential_validation-logs-v3.7.28 && chmod 777 ct-unit_access_control_credential_validation-logs-v3.7.28
         docker run \
@@ -5479,11 +5682,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_credential_validation-logs-mixed-v3.7.28
         path: ct-unit_access_control_credential_validation-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_access_control_credential_validation [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_access_control_credential_validation-logs-v3.8.9 && chmod 777 ct-unit_access_control_credential_validation-logs-v3.8.9
         docker run \
@@ -5497,7 +5701,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_credential_validation-logs-mixed-v3.8.9
         path: ct-unit_access_control_credential_validation-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5521,6 +5725,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_amqp091_content_framing
+      id: tests
       run: |
         mkdir ct-unit_amqp091_content_framing-logs && chmod 777 ct-unit_amqp091_content_framing-logs
         docker run \
@@ -5533,11 +5738,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_content_framing-logs
         path: ct-unit_amqp091_content_framing-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_amqp091_content_framing [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_amqp091_content_framing-logs-v3.7.28 && chmod 777 ct-unit_amqp091_content_framing-logs-v3.7.28
         docker run \
@@ -5551,11 +5757,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_content_framing-logs-mixed-v3.7.28
         path: ct-unit_amqp091_content_framing-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_amqp091_content_framing [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_amqp091_content_framing-logs-v3.8.9 && chmod 777 ct-unit_amqp091_content_framing-logs-v3.8.9
         docker run \
@@ -5569,7 +5776,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_content_framing-logs-mixed-v3.8.9
         path: ct-unit_amqp091_content_framing-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5593,6 +5800,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_amqp091_server_properties
+      id: tests
       run: |
         mkdir ct-unit_amqp091_server_properties-logs && chmod 777 ct-unit_amqp091_server_properties-logs
         docker run \
@@ -5605,11 +5813,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_server_properties-logs
         path: ct-unit_amqp091_server_properties-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_amqp091_server_properties [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_amqp091_server_properties-logs-v3.7.28 && chmod 777 ct-unit_amqp091_server_properties-logs-v3.7.28
         docker run \
@@ -5623,11 +5832,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_server_properties-logs-mixed-v3.7.28
         path: ct-unit_amqp091_server_properties-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_amqp091_server_properties [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_amqp091_server_properties-logs-v3.8.9 && chmod 777 ct-unit_amqp091_server_properties-logs-v3.8.9
         docker run \
@@ -5641,7 +5851,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_server_properties-logs-mixed-v3.8.9
         path: ct-unit_amqp091_server_properties-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5665,6 +5875,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_app_management
+      id: tests
       run: |
         mkdir ct-unit_app_management-logs && chmod 777 ct-unit_app_management-logs
         docker run \
@@ -5677,11 +5888,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_app_management-logs
         path: ct-unit_app_management-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_app_management [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_app_management-logs-v3.7.28 && chmod 777 ct-unit_app_management-logs-v3.7.28
         docker run \
@@ -5695,11 +5907,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_app_management-logs-mixed-v3.7.28
         path: ct-unit_app_management-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_app_management [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_app_management-logs-v3.8.9 && chmod 777 ct-unit_app_management-logs-v3.8.9
         docker run \
@@ -5713,7 +5926,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_app_management-logs-mixed-v3.8.9
         path: ct-unit_app_management-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5737,6 +5950,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_cluster_formation_locking_mocks
+      id: tests
       run: |
         mkdir ct-unit_cluster_formation_locking_mocks-logs && chmod 777 ct-unit_cluster_formation_locking_mocks-logs
         docker run \
@@ -5749,11 +5963,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_cluster_formation_locking_mocks-logs
         path: ct-unit_cluster_formation_locking_mocks-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_cluster_formation_locking_mocks [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_cluster_formation_locking_mocks-logs-v3.7.28 && chmod 777 ct-unit_cluster_formation_locking_mocks-logs-v3.7.28
         docker run \
@@ -5767,11 +5982,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_cluster_formation_locking_mocks-logs-mixed-v3.7.28
         path: ct-unit_cluster_formation_locking_mocks-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_cluster_formation_locking_mocks [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_cluster_formation_locking_mocks-logs-v3.8.9 && chmod 777 ct-unit_cluster_formation_locking_mocks-logs-v3.8.9
         docker run \
@@ -5785,7 +6001,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_cluster_formation_locking_mocks-logs-mixed-v3.8.9
         path: ct-unit_cluster_formation_locking_mocks-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5809,6 +6025,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_collections
+      id: tests
       run: |
         mkdir ct-unit_collections-logs && chmod 777 ct-unit_collections-logs
         docker run \
@@ -5821,11 +6038,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_collections-logs
         path: ct-unit_collections-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_collections [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_collections-logs-v3.7.28 && chmod 777 ct-unit_collections-logs-v3.7.28
         docker run \
@@ -5839,11 +6057,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_collections-logs-mixed-v3.7.28
         path: ct-unit_collections-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_collections [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_collections-logs-v3.8.9 && chmod 777 ct-unit_collections-logs-v3.8.9
         docker run \
@@ -5857,7 +6076,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_collections-logs-mixed-v3.8.9
         path: ct-unit_collections-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5881,6 +6100,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_config_value_encryption
+      id: tests
       run: |
         mkdir ct-unit_config_value_encryption-logs && chmod 777 ct-unit_config_value_encryption-logs
         docker run \
@@ -5893,11 +6113,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_config_value_encryption-logs
         path: ct-unit_config_value_encryption-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_config_value_encryption [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_config_value_encryption-logs-v3.7.28 && chmod 777 ct-unit_config_value_encryption-logs-v3.7.28
         docker run \
@@ -5911,11 +6132,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_config_value_encryption-logs-mixed-v3.7.28
         path: ct-unit_config_value_encryption-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_config_value_encryption [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_config_value_encryption-logs-v3.8.9 && chmod 777 ct-unit_config_value_encryption-logs-v3.8.9
         docker run \
@@ -5929,7 +6151,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_config_value_encryption-logs-mixed-v3.8.9
         path: ct-unit_config_value_encryption-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -5953,6 +6175,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_connection_tracking
+      id: tests
       run: |
         mkdir ct-unit_connection_tracking-logs && chmod 777 ct-unit_connection_tracking-logs
         docker run \
@@ -5965,11 +6188,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_connection_tracking-logs
         path: ct-unit_connection_tracking-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_connection_tracking [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_connection_tracking-logs-v3.7.28 && chmod 777 ct-unit_connection_tracking-logs-v3.7.28
         docker run \
@@ -5983,11 +6207,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_connection_tracking-logs-mixed-v3.7.28
         path: ct-unit_connection_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_connection_tracking [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_connection_tracking-logs-v3.8.9 && chmod 777 ct-unit_connection_tracking-logs-v3.8.9
         docker run \
@@ -6001,7 +6226,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_connection_tracking-logs-mixed-v3.8.9
         path: ct-unit_connection_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6025,6 +6250,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_credit_flow
+      id: tests
       run: |
         mkdir ct-unit_credit_flow-logs && chmod 777 ct-unit_credit_flow-logs
         docker run \
@@ -6037,11 +6263,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_credit_flow-logs
         path: ct-unit_credit_flow-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_credit_flow [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_credit_flow-logs-v3.7.28 && chmod 777 ct-unit_credit_flow-logs-v3.7.28
         docker run \
@@ -6055,11 +6282,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_credit_flow-logs-mixed-v3.7.28
         path: ct-unit_credit_flow-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_credit_flow [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_credit_flow-logs-v3.8.9 && chmod 777 ct-unit_credit_flow-logs-v3.8.9
         docker run \
@@ -6073,7 +6301,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_credit_flow-logs-mixed-v3.8.9
         path: ct-unit_credit_flow-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6097,6 +6325,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_disk_monitor
+      id: tests
       run: |
         mkdir ct-unit_disk_monitor-logs && chmod 777 ct-unit_disk_monitor-logs
         docker run \
@@ -6109,11 +6338,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor-logs
         path: ct-unit_disk_monitor-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_disk_monitor [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_disk_monitor-logs-v3.7.28 && chmod 777 ct-unit_disk_monitor-logs-v3.7.28
         docker run \
@@ -6127,11 +6357,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor-logs-mixed-v3.7.28
         path: ct-unit_disk_monitor-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_disk_monitor [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_disk_monitor-logs-v3.8.9 && chmod 777 ct-unit_disk_monitor-logs-v3.8.9
         docker run \
@@ -6145,7 +6376,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor-logs-mixed-v3.8.9
         path: ct-unit_disk_monitor-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6169,6 +6400,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_disk_monitor_mocks
+      id: tests
       run: |
         mkdir ct-unit_disk_monitor_mocks-logs && chmod 777 ct-unit_disk_monitor_mocks-logs
         docker run \
@@ -6181,11 +6413,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor_mocks-logs
         path: ct-unit_disk_monitor_mocks-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_disk_monitor_mocks [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_disk_monitor_mocks-logs-v3.7.28 && chmod 777 ct-unit_disk_monitor_mocks-logs-v3.7.28
         docker run \
@@ -6199,11 +6432,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor_mocks-logs-mixed-v3.7.28
         path: ct-unit_disk_monitor_mocks-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_disk_monitor_mocks [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_disk_monitor_mocks-logs-v3.8.9 && chmod 777 ct-unit_disk_monitor_mocks-logs-v3.8.9
         docker run \
@@ -6217,7 +6451,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor_mocks-logs-mixed-v3.8.9
         path: ct-unit_disk_monitor_mocks-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6241,6 +6475,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_file_handle_cache
+      id: tests
       run: |
         mkdir ct-unit_file_handle_cache-logs && chmod 777 ct-unit_file_handle_cache-logs
         docker run \
@@ -6253,11 +6488,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_file_handle_cache-logs
         path: ct-unit_file_handle_cache-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_file_handle_cache [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_file_handle_cache-logs-v3.7.28 && chmod 777 ct-unit_file_handle_cache-logs-v3.7.28
         docker run \
@@ -6271,11 +6507,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_file_handle_cache-logs-mixed-v3.7.28
         path: ct-unit_file_handle_cache-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_file_handle_cache [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_file_handle_cache-logs-v3.8.9 && chmod 777 ct-unit_file_handle_cache-logs-v3.8.9
         docker run \
@@ -6289,7 +6526,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_file_handle_cache-logs-mixed-v3.8.9
         path: ct-unit_file_handle_cache-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6313,6 +6550,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_gen_server2
+      id: tests
       run: |
         mkdir ct-unit_gen_server2-logs && chmod 777 ct-unit_gen_server2-logs
         docker run \
@@ -6325,11 +6563,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gen_server2-logs
         path: ct-unit_gen_server2-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_gen_server2 [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_gen_server2-logs-v3.7.28 && chmod 777 ct-unit_gen_server2-logs-v3.7.28
         docker run \
@@ -6343,11 +6582,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gen_server2-logs-mixed-v3.7.28
         path: ct-unit_gen_server2-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_gen_server2 [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_gen_server2-logs-v3.8.9 && chmod 777 ct-unit_gen_server2-logs-v3.8.9
         docker run \
@@ -6361,7 +6601,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gen_server2-logs-mixed-v3.8.9
         path: ct-unit_gen_server2-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6385,6 +6625,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_gm
+      id: tests
       run: |
         mkdir ct-unit_gm-logs && chmod 777 ct-unit_gm-logs
         docker run \
@@ -6397,11 +6638,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gm-logs
         path: ct-unit_gm-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_gm [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_gm-logs-v3.7.28 && chmod 777 ct-unit_gm-logs-v3.7.28
         docker run \
@@ -6415,11 +6657,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gm-logs-mixed-v3.7.28
         path: ct-unit_gm-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_gm [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_gm-logs-v3.8.9 && chmod 777 ct-unit_gm-logs-v3.8.9
         docker run \
@@ -6433,7 +6676,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gm-logs-mixed-v3.8.9
         path: ct-unit_gm-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6457,6 +6700,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_log_config
+      id: tests
       run: |
         mkdir ct-unit_log_config-logs && chmod 777 ct-unit_log_config-logs
         docker run \
@@ -6469,11 +6713,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_config-logs
         path: ct-unit_log_config-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_log_config [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_log_config-logs-v3.7.28 && chmod 777 ct-unit_log_config-logs-v3.7.28
         docker run \
@@ -6487,11 +6732,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_config-logs-mixed-v3.7.28
         path: ct-unit_log_config-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_log_config [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_log_config-logs-v3.8.9 && chmod 777 ct-unit_log_config-logs-v3.8.9
         docker run \
@@ -6505,7 +6751,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_config-logs-mixed-v3.8.9
         path: ct-unit_log_config-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6529,6 +6775,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_log_management
+      id: tests
       run: |
         mkdir ct-unit_log_management-logs && chmod 777 ct-unit_log_management-logs
         docker run \
@@ -6541,11 +6788,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_management-logs
         path: ct-unit_log_management-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_log_management [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_log_management-logs-v3.7.28 && chmod 777 ct-unit_log_management-logs-v3.7.28
         docker run \
@@ -6559,11 +6807,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_management-logs-mixed-v3.7.28
         path: ct-unit_log_management-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_log_management [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_log_management-logs-v3.8.9 && chmod 777 ct-unit_log_management-logs-v3.8.9
         docker run \
@@ -6577,7 +6826,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_management-logs-mixed-v3.8.9
         path: ct-unit_log_management-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6601,6 +6850,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_operator_policy
+      id: tests
       run: |
         mkdir ct-unit_operator_policy-logs && chmod 777 ct-unit_operator_policy-logs
         docker run \
@@ -6613,11 +6863,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_operator_policy-logs
         path: ct-unit_operator_policy-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_operator_policy [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_operator_policy-logs-v3.7.28 && chmod 777 ct-unit_operator_policy-logs-v3.7.28
         docker run \
@@ -6631,11 +6882,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_operator_policy-logs-mixed-v3.7.28
         path: ct-unit_operator_policy-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_operator_policy [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_operator_policy-logs-v3.8.9 && chmod 777 ct-unit_operator_policy-logs-v3.8.9
         docker run \
@@ -6649,7 +6901,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_operator_policy-logs-mixed-v3.8.9
         path: ct-unit_operator_policy-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6673,6 +6925,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_pg_local
+      id: tests
       run: |
         mkdir ct-unit_pg_local-logs && chmod 777 ct-unit_pg_local-logs
         docker run \
@@ -6685,11 +6938,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_pg_local-logs
         path: ct-unit_pg_local-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_pg_local [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_pg_local-logs-v3.7.28 && chmod 777 ct-unit_pg_local-logs-v3.7.28
         docker run \
@@ -6703,11 +6957,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_pg_local-logs-mixed-v3.7.28
         path: ct-unit_pg_local-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_pg_local [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_pg_local-logs-v3.8.9 && chmod 777 ct-unit_pg_local-logs-v3.8.9
         docker run \
@@ -6721,7 +6976,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_pg_local-logs-mixed-v3.8.9
         path: ct-unit_pg_local-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6745,6 +7000,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_plugin_directories
+      id: tests
       run: |
         mkdir ct-unit_plugin_directories-logs && chmod 777 ct-unit_plugin_directories-logs
         docker run \
@@ -6757,11 +7013,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_directories-logs
         path: ct-unit_plugin_directories-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_plugin_directories [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_plugin_directories-logs-v3.7.28 && chmod 777 ct-unit_plugin_directories-logs-v3.7.28
         docker run \
@@ -6775,11 +7032,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_directories-logs-mixed-v3.7.28
         path: ct-unit_plugin_directories-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_plugin_directories [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_plugin_directories-logs-v3.8.9 && chmod 777 ct-unit_plugin_directories-logs-v3.8.9
         docker run \
@@ -6793,7 +7051,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_directories-logs-mixed-v3.8.9
         path: ct-unit_plugin_directories-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6817,6 +7075,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_plugin_versioning
+      id: tests
       run: |
         mkdir ct-unit_plugin_versioning-logs && chmod 777 ct-unit_plugin_versioning-logs
         docker run \
@@ -6829,11 +7088,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_versioning-logs
         path: ct-unit_plugin_versioning-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_plugin_versioning [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_plugin_versioning-logs-v3.7.28 && chmod 777 ct-unit_plugin_versioning-logs-v3.7.28
         docker run \
@@ -6847,11 +7107,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_versioning-logs-mixed-v3.7.28
         path: ct-unit_plugin_versioning-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_plugin_versioning [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_plugin_versioning-logs-v3.8.9 && chmod 777 ct-unit_plugin_versioning-logs-v3.8.9
         docker run \
@@ -6865,7 +7126,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_versioning-logs-mixed-v3.8.9
         path: ct-unit_plugin_versioning-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6889,6 +7150,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_policy_validators
+      id: tests
       run: |
         mkdir ct-unit_policy_validators-logs && chmod 777 ct-unit_policy_validators-logs
         docker run \
@@ -6901,11 +7163,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_policy_validators-logs
         path: ct-unit_policy_validators-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_policy_validators [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_policy_validators-logs-v3.7.28 && chmod 777 ct-unit_policy_validators-logs-v3.7.28
         docker run \
@@ -6919,11 +7182,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_policy_validators-logs-mixed-v3.7.28
         path: ct-unit_policy_validators-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_policy_validators [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_policy_validators-logs-v3.8.9 && chmod 777 ct-unit_policy_validators-logs-v3.8.9
         docker run \
@@ -6937,7 +7201,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_policy_validators-logs-mixed-v3.8.9
         path: ct-unit_policy_validators-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -6961,6 +7225,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_priority_queue
+      id: tests
       run: |
         mkdir ct-unit_priority_queue-logs && chmod 777 ct-unit_priority_queue-logs
         docker run \
@@ -6973,11 +7238,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_priority_queue-logs
         path: ct-unit_priority_queue-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_priority_queue [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_priority_queue-logs-v3.7.28 && chmod 777 ct-unit_priority_queue-logs-v3.7.28
         docker run \
@@ -6991,11 +7257,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_priority_queue-logs-mixed-v3.7.28
         path: ct-unit_priority_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_priority_queue [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_priority_queue-logs-v3.8.9 && chmod 777 ct-unit_priority_queue-logs-v3.8.9
         docker run \
@@ -7009,7 +7276,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_priority_queue-logs-mixed-v3.8.9
         path: ct-unit_priority_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -7033,6 +7300,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_queue_consumers
+      id: tests
       run: |
         mkdir ct-unit_queue_consumers-logs && chmod 777 ct-unit_queue_consumers-logs
         docker run \
@@ -7045,11 +7313,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_queue_consumers-logs
         path: ct-unit_queue_consumers-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_queue_consumers [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_queue_consumers-logs-v3.7.28 && chmod 777 ct-unit_queue_consumers-logs-v3.7.28
         docker run \
@@ -7063,11 +7332,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_queue_consumers-logs-mixed-v3.7.28
         path: ct-unit_queue_consumers-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_queue_consumers [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_queue_consumers-logs-v3.8.9 && chmod 777 ct-unit_queue_consumers-logs-v3.8.9
         docker run \
@@ -7081,7 +7351,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_queue_consumers-logs-mixed-v3.8.9
         path: ct-unit_queue_consumers-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -7105,6 +7375,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_stats_and_metrics
+      id: tests
       run: |
         mkdir ct-unit_stats_and_metrics-logs && chmod 777 ct-unit_stats_and_metrics-logs
         docker run \
@@ -7117,11 +7388,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_stats_and_metrics-logs
         path: ct-unit_stats_and_metrics-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_stats_and_metrics [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_stats_and_metrics-logs-v3.7.28 && chmod 777 ct-unit_stats_and_metrics-logs-v3.7.28
         docker run \
@@ -7135,11 +7407,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_stats_and_metrics-logs-mixed-v3.7.28
         path: ct-unit_stats_and_metrics-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_stats_and_metrics [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_stats_and_metrics-logs-v3.8.9 && chmod 777 ct-unit_stats_and_metrics-logs-v3.8.9
         docker run \
@@ -7153,7 +7426,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_stats_and_metrics-logs-mixed-v3.8.9
         path: ct-unit_stats_and_metrics-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -7177,6 +7450,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_supervisor2
+      id: tests
       run: |
         mkdir ct-unit_supervisor2-logs && chmod 777 ct-unit_supervisor2-logs
         docker run \
@@ -7189,11 +7463,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_supervisor2-logs
         path: ct-unit_supervisor2-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_supervisor2 [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_supervisor2-logs-v3.7.28 && chmod 777 ct-unit_supervisor2-logs-v3.7.28
         docker run \
@@ -7207,11 +7482,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_supervisor2-logs-mixed-v3.7.28
         path: ct-unit_supervisor2-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_supervisor2 [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_supervisor2-logs-v3.8.9 && chmod 777 ct-unit_supervisor2-logs-v3.8.9
         docker run \
@@ -7225,7 +7501,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_supervisor2-logs-mixed-v3.8.9
         path: ct-unit_supervisor2-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -7249,6 +7525,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_vm_memory_monitor
+      id: tests
       run: |
         mkdir ct-unit_vm_memory_monitor-logs && chmod 777 ct-unit_vm_memory_monitor-logs
         docker run \
@@ -7261,11 +7538,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_vm_memory_monitor-logs
         path: ct-unit_vm_memory_monitor-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_vm_memory_monitor [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-unit_vm_memory_monitor-logs-v3.7.28 && chmod 777 ct-unit_vm_memory_monitor-logs-v3.7.28
         docker run \
@@ -7279,11 +7557,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-unit_vm_memory_monitor-logs-mixed-v3.7.28
         path: ct-unit_vm_memory_monitor-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-unit_vm_memory_monitor [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-unit_vm_memory_monitor-logs-v3.8.9 && chmod 777 ct-unit_vm_memory_monitor-logs-v3.8.9
         docker run \
@@ -7297,7 +7576,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-unit_vm_memory_monitor-logs-mixed-v3.8.9
         path: ct-unit_vm_memory_monitor-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -7321,6 +7600,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-upgrade_preparation
+      id: tests
       run: |
         mkdir ct-upgrade_preparation-logs && chmod 777 ct-upgrade_preparation-logs
         docker run \
@@ -7333,11 +7613,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-upgrade_preparation-logs
         path: ct-upgrade_preparation-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-upgrade_preparation [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-upgrade_preparation-logs-v3.7.28 && chmod 777 ct-upgrade_preparation-logs-v3.7.28
         docker run \
@@ -7351,11 +7632,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-upgrade_preparation-logs-mixed-v3.7.28
         path: ct-upgrade_preparation-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-upgrade_preparation [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-upgrade_preparation-logs-v3.8.9 && chmod 777 ct-upgrade_preparation-logs-v3.8.9
         docker run \
@@ -7369,7 +7651,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-upgrade_preparation-logs-mixed-v3.8.9
         path: ct-upgrade_preparation-logs-v3.8.9/*-ct-logs-*.tar.xz
@@ -7393,6 +7675,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-vhost
+      id: tests
       run: |
         mkdir ct-vhost-logs && chmod 777 ct-vhost-logs
         docker run \
@@ -7405,11 +7688,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-vhost-logs
         path: ct-vhost-logs/*-ct-logs-*.tar.xz
     - name: RUN ct-vhost [mixed v3.7.28]
+      id: tests-v3_7_28
       run: |
         mkdir ct-vhost-logs-v3.7.28 && chmod 777 ct-vhost-logs-v3.7.28
         docker run \
@@ -7423,11 +7707,12 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_7_28.outcome == 'failure'
       with:
         name: rabbit-ct-vhost-logs-mixed-v3.7.28
         path: ct-vhost-logs-v3.7.28/*-ct-logs-*.tar.xz
     - name: RUN ct-vhost [mixed v3.8.9]
+      id: tests-v3_8_9
       run: |
         mkdir ct-vhost-logs-v3.8.9 && chmod 777 ct-vhost-logs-v3.8.9
         docker run \
@@ -7441,7 +7726,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests-v3_8_9.outcome == 'failure'
       with:
         name: rabbit-ct-vhost-logs-mixed-v3.8.9
         path: ct-vhost-logs-v3.8.9/*-ct-logs-*.tar.xz
diff --git a/.github/workflows/test-erlang-otp-23.1.yaml b/.github/workflows/test-erlang-otp-23.1.yaml
index 79aba5cd74..469ecf17a2 100644
--- a/.github/workflows/test-erlang-otp-23.1.yaml
+++ b/.github/workflows/test-erlang-otp-23.1.yaml
@@ -799,6 +799,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-amqqueue_backward_compatibility
+      id: tests
       run: |
         mkdir ct-amqqueue_backward_compatibility-logs && chmod 777 ct-amqqueue_backward_compatibility-logs
         docker run \
@@ -811,7 +812,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-amqqueue_backward_compatibility-logs
         path: ct-amqqueue_backward_compatibility-logs/*-ct-logs-*.tar.xz
@@ -835,6 +836,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-backing_queue
+      id: tests
       run: |
         mkdir ct-backing_queue-logs && chmod 777 ct-backing_queue-logs
         docker run \
@@ -847,7 +849,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-backing_queue-logs
         path: ct-backing_queue-logs/*-ct-logs-*.tar.xz
@@ -871,6 +873,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-channel_interceptor
+      id: tests
       run: |
         mkdir ct-channel_interceptor-logs && chmod 777 ct-channel_interceptor-logs
         docker run \
@@ -883,7 +886,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-channel_interceptor-logs
         path: ct-channel_interceptor-logs/*-ct-logs-*.tar.xz
@@ -907,6 +910,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-channel_operation_timeout
+      id: tests
       run: |
         mkdir ct-channel_operation_timeout-logs && chmod 777 ct-channel_operation_timeout-logs
         docker run \
@@ -919,7 +923,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-channel_operation_timeout-logs
         path: ct-channel_operation_timeout-logs/*-ct-logs-*.tar.xz
@@ -943,6 +947,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-cluster
+      id: tests
       run: |
         mkdir ct-cluster-logs && chmod 777 ct-cluster-logs
         docker run \
@@ -955,7 +960,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-cluster-logs
         path: ct-cluster-logs/*-ct-logs-*.tar.xz
@@ -979,6 +984,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-cluster_rename
+      id: tests
       run: |
         mkdir ct-cluster_rename-logs && chmod 777 ct-cluster_rename-logs
         docker run \
@@ -991,7 +997,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-cluster_rename-logs
         path: ct-cluster_rename-logs/*-ct-logs-*.tar.xz
@@ -1015,6 +1021,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-clustering_management
+      id: tests
       run: |
         mkdir ct-clustering_management-logs && chmod 777 ct-clustering_management-logs
         docker run \
@@ -1027,7 +1034,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-clustering_management-logs
         path: ct-clustering_management-logs/*-ct-logs-*.tar.xz
@@ -1051,6 +1058,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-config_schema
+      id: tests
       run: |
         mkdir ct-config_schema-logs && chmod 777 ct-config_schema-logs
         docker run \
@@ -1063,7 +1071,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-config_schema-logs
         path: ct-config_schema-logs/*-ct-logs-*.tar.xz
@@ -1087,6 +1095,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-confirms_rejects
+      id: tests
       run: |
         mkdir ct-confirms_rejects-logs && chmod 777 ct-confirms_rejects-logs
         docker run \
@@ -1099,7 +1108,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-confirms_rejects-logs
         path: ct-confirms_rejects-logs/*-ct-logs-*.tar.xz
@@ -1123,6 +1132,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-consumer_timeout
+      id: tests
       run: |
         mkdir ct-consumer_timeout-logs && chmod 777 ct-consumer_timeout-logs
         docker run \
@@ -1135,7 +1145,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-consumer_timeout-logs
         path: ct-consumer_timeout-logs/*-ct-logs-*.tar.xz
@@ -1159,6 +1169,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-crashing_queues
+      id: tests
       run: |
         mkdir ct-crashing_queues-logs && chmod 777 ct-crashing_queues-logs
         docker run \
@@ -1171,7 +1182,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-crashing_queues-logs
         path: ct-crashing_queues-logs/*-ct-logs-*.tar.xz
@@ -1195,6 +1206,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-dead_lettering
+      id: tests
       run: |
         mkdir ct-dead_lettering-logs && chmod 777 ct-dead_lettering-logs
         docker run \
@@ -1207,7 +1219,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dead_lettering-logs
         path: ct-dead_lettering-logs/*-ct-logs-*.tar.xz
@@ -1231,6 +1243,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-definition_import
+      id: tests
       run: |
         mkdir ct-definition_import-logs && chmod 777 ct-definition_import-logs
         docker run \
@@ -1243,7 +1256,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-definition_import-logs
         path: ct-definition_import-logs/*-ct-logs-*.tar.xz
@@ -1267,6 +1280,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-disconnect_detected_during_alarm
+      id: tests
       run: |
         mkdir ct-disconnect_detected_during_alarm-logs && chmod 777 ct-disconnect_detected_during_alarm-logs
         docker run \
@@ -1279,7 +1293,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-disconnect_detected_during_alarm-logs
         path: ct-disconnect_detected_during_alarm-logs/*-ct-logs-*.tar.xz
@@ -1303,6 +1317,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-dynamic_ha
+      id: tests
       run: |
         mkdir ct-dynamic_ha-logs && chmod 777 ct-dynamic_ha-logs
         docker run \
@@ -1315,7 +1330,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_ha-logs
         path: ct-dynamic_ha-logs/*-ct-logs-*.tar.xz
@@ -1339,6 +1354,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-dynamic_qq
+      id: tests
       run: |
         mkdir ct-dynamic_qq-logs && chmod 777 ct-dynamic_qq-logs
         docker run \
@@ -1351,7 +1367,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_qq-logs
         path: ct-dynamic_qq-logs/*-ct-logs-*.tar.xz
@@ -1375,6 +1391,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-eager_sync
+      id: tests
       run: |
         mkdir ct-eager_sync-logs && chmod 777 ct-eager_sync-logs
         docker run \
@@ -1387,7 +1404,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-eager_sync-logs
         path: ct-eager_sync-logs/*-ct-logs-*.tar.xz
@@ -1411,6 +1428,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-feature_flags
+      id: tests
       run: |
         mkdir ct-feature_flags-logs && chmod 777 ct-feature_flags-logs
         docker run \
@@ -1423,7 +1441,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-feature_flags-logs
         path: ct-feature_flags-logs/*-ct-logs-*.tar.xz
@@ -1447,6 +1465,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-lazy_queue
+      id: tests
       run: |
         mkdir ct-lazy_queue-logs && chmod 777 ct-lazy_queue-logs
         docker run \
@@ -1459,7 +1478,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-lazy_queue-logs
         path: ct-lazy_queue-logs/*-ct-logs-*.tar.xz
@@ -1483,6 +1502,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-list_consumers_sanity_check
+      id: tests
       run: |
         mkdir ct-list_consumers_sanity_check-logs && chmod 777 ct-list_consumers_sanity_check-logs
         docker run \
@@ -1495,7 +1515,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-list_consumers_sanity_check-logs
         path: ct-list_consumers_sanity_check-logs/*-ct-logs-*.tar.xz
@@ -1519,6 +1539,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-list_queues_online_and_offline
+      id: tests
       run: |
         mkdir ct-list_queues_online_and_offline-logs && chmod 777 ct-list_queues_online_and_offline-logs
         docker run \
@@ -1531,7 +1552,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-list_queues_online_and_offline-logs
         path: ct-list_queues_online_and_offline-logs/*-ct-logs-*.tar.xz
@@ -1555,6 +1576,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-maintenance_mode
+      id: tests
       run: |
         mkdir ct-maintenance_mode-logs && chmod 777 ct-maintenance_mode-logs
         docker run \
@@ -1567,7 +1589,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-maintenance_mode-logs
         path: ct-maintenance_mode-logs/*-ct-logs-*.tar.xz
@@ -1591,6 +1613,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-many_node_ha
+      id: tests
       run: |
         mkdir ct-many_node_ha-logs && chmod 777 ct-many_node_ha-logs
         docker run \
@@ -1603,7 +1626,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-many_node_ha-logs
         path: ct-many_node_ha-logs/*-ct-logs-*.tar.xz
@@ -1627,6 +1650,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-message_size_limit
+      id: tests
       run: |
         mkdir ct-message_size_limit-logs && chmod 777 ct-message_size_limit-logs
         docker run \
@@ -1639,7 +1663,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-message_size_limit-logs
         path: ct-message_size_limit-logs/*-ct-logs-*.tar.xz
@@ -1663,6 +1687,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-metrics
+      id: tests
       run: |
         mkdir ct-metrics-logs && chmod 777 ct-metrics-logs
         docker run \
@@ -1675,7 +1700,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-metrics-logs
         path: ct-metrics-logs/*-ct-logs-*.tar.xz
@@ -1699,6 +1724,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-mirrored_supervisor
+      id: tests
       run: |
         mkdir ct-mirrored_supervisor-logs && chmod 777 ct-mirrored_supervisor-logs
         docker run \
@@ -1711,7 +1737,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-mirrored_supervisor-logs
         path: ct-mirrored_supervisor-logs/*-ct-logs-*.tar.xz
@@ -1735,6 +1761,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-msg_store
+      id: tests
       run: |
         mkdir ct-msg_store-logs && chmod 777 ct-msg_store-logs
         docker run \
@@ -1747,7 +1774,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-msg_store-logs
         path: ct-msg_store-logs/*-ct-logs-*.tar.xz
@@ -1771,6 +1798,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-peer_discovery_classic_config
+      id: tests
       run: |
         mkdir ct-peer_discovery_classic_config-logs && chmod 777 ct-peer_discovery_classic_config-logs
         docker run \
@@ -1783,7 +1811,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_classic_config-logs
         path: ct-peer_discovery_classic_config-logs/*-ct-logs-*.tar.xz
@@ -1807,6 +1835,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-peer_discovery_dns
+      id: tests
       run: |
         mkdir ct-peer_discovery_dns-logs && chmod 777 ct-peer_discovery_dns-logs
         docker run \
@@ -1819,7 +1848,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_dns-logs
         path: ct-peer_discovery_dns-logs/*-ct-logs-*.tar.xz
@@ -1843,6 +1872,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_limit
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_limit-logs && chmod 777 ct-per_user_connection_channel_limit-logs
         docker run \
@@ -1855,7 +1885,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit-logs
         path: ct-per_user_connection_channel_limit-logs/*-ct-logs-*.tar.xz
@@ -1879,6 +1909,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_limit_partitions
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_limit_partitions-logs && chmod 777 ct-per_user_connection_channel_limit_partitions-logs
         docker run \
@@ -1891,7 +1922,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit_partitions-logs
         path: ct-per_user_connection_channel_limit_partitions-logs/*-ct-logs-*.tar.xz
@@ -1915,6 +1946,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_tracking
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_tracking-logs && chmod 777 ct-per_user_connection_channel_tracking-logs
         docker run \
@@ -1927,7 +1959,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_tracking-logs
         path: ct-per_user_connection_channel_tracking-logs/*-ct-logs-*.tar.xz
@@ -1951,6 +1983,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_tracking
+      id: tests
       run: |
         mkdir ct-per_user_connection_tracking-logs && chmod 777 ct-per_user_connection_tracking-logs
         docker run \
@@ -1963,7 +1996,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_tracking-logs
         path: ct-per_user_connection_tracking-logs/*-ct-logs-*.tar.xz
@@ -1987,6 +2020,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_connection_limit
+      id: tests
       run: |
         mkdir ct-per_vhost_connection_limit-logs && chmod 777 ct-per_vhost_connection_limit-logs
         docker run \
@@ -1999,7 +2033,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit-logs
         path: ct-per_vhost_connection_limit-logs/*-ct-logs-*.tar.xz
@@ -2023,6 +2057,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_connection_limit_partitions
+      id: tests
       run: |
         mkdir ct-per_vhost_connection_limit_partitions-logs && chmod 777 ct-per_vhost_connection_limit_partitions-logs
         docker run \
@@ -2035,7 +2070,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit_partitions-logs
         path: ct-per_vhost_connection_limit_partitions-logs/*-ct-logs-*.tar.xz
@@ -2059,6 +2094,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_msg_store
+      id: tests
       run: |
         mkdir ct-per_vhost_msg_store-logs && chmod 777 ct-per_vhost_msg_store-logs
         docker run \
@@ -2071,7 +2107,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_msg_store-logs
         path: ct-per_vhost_msg_store-logs/*-ct-logs-*.tar.xz
@@ -2095,6 +2131,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_queue_limit
+      id: tests
       run: |
         mkdir ct-per_vhost_queue_limit-logs && chmod 777 ct-per_vhost_queue_limit-logs
         docker run \
@@ -2107,7 +2144,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_queue_limit-logs
         path: ct-per_vhost_queue_limit-logs/*-ct-logs-*.tar.xz
@@ -2131,6 +2168,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-policy
+      id: tests
       run: |
         mkdir ct-policy-logs && chmod 777 ct-policy-logs
         docker run \
@@ -2143,7 +2181,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-policy-logs
         path: ct-policy-logs/*-ct-logs-*.tar.xz
@@ -2167,6 +2205,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-priority_queue
+      id: tests
       run: |
         mkdir ct-priority_queue-logs && chmod 777 ct-priority_queue-logs
         docker run \
@@ -2179,7 +2218,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue-logs
         path: ct-priority_queue-logs/*-ct-logs-*.tar.xz
@@ -2203,6 +2242,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-priority_queue_recovery
+      id: tests
       run: |
         mkdir ct-priority_queue_recovery-logs && chmod 777 ct-priority_queue_recovery-logs
         docker run \
@@ -2215,7 +2255,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue_recovery-logs
         path: ct-priority_queue_recovery-logs/*-ct-logs-*.tar.xz
@@ -2239,6 +2279,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-product_info
+      id: tests
       run: |
         mkdir ct-product_info-logs && chmod 777 ct-product_info-logs
         docker run \
@@ -2251,7 +2292,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-product_info-logs
         path: ct-product_info-logs/*-ct-logs-*.tar.xz
@@ -2275,6 +2316,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-proxy_protocol
+      id: tests
       run: |
         mkdir ct-proxy_protocol-logs && chmod 777 ct-proxy_protocol-logs
         docker run \
@@ -2287,7 +2329,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-proxy_protocol-logs
         path: ct-proxy_protocol-logs/*-ct-logs-*.tar.xz
@@ -2311,6 +2353,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-publisher_confirms_parallel
+      id: tests
       run: |
         mkdir ct-publisher_confirms_parallel-logs && chmod 777 ct-publisher_confirms_parallel-logs
         docker run \
@@ -2323,7 +2366,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-publisher_confirms_parallel-logs
         path: ct-publisher_confirms_parallel-logs/*-ct-logs-*.tar.xz
@@ -2347,6 +2390,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_length_limits
+      id: tests
       run: |
         mkdir ct-queue_length_limits-logs && chmod 777 ct-queue_length_limits-logs
         docker run \
@@ -2359,7 +2403,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_length_limits-logs
         path: ct-queue_length_limits-logs/*-ct-logs-*.tar.xz
@@ -2383,6 +2427,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_master_location
+      id: tests
       run: |
         mkdir ct-queue_master_location-logs && chmod 777 ct-queue_master_location-logs
         docker run \
@@ -2395,7 +2440,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_master_location-logs
         path: ct-queue_master_location-logs/*-ct-logs-*.tar.xz
@@ -2419,6 +2464,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_parallel
+      id: tests
       run: |
         mkdir ct-queue_parallel-logs && chmod 777 ct-queue_parallel-logs
         docker run \
@@ -2431,7 +2477,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_parallel-logs
         path: ct-queue_parallel-logs/*-ct-logs-*.tar.xz
@@ -2455,6 +2501,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_type
+      id: tests
       run: |
         mkdir ct-queue_type-logs && chmod 777 ct-queue_type-logs
         docker run \
@@ -2467,7 +2514,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_type-logs
         path: ct-queue_type-logs/*-ct-logs-*.tar.xz
@@ -2491,6 +2538,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-quorum_queue
+      id: tests
       run: |
         mkdir ct-quorum_queue-logs && chmod 777 ct-quorum_queue-logs
         docker run \
@@ -2503,7 +2551,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-quorum_queue-logs
         path: ct-quorum_queue-logs/*-ct-logs-*.tar.xz
@@ -2527,6 +2575,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_confirms
+      id: tests
       run: |
         mkdir ct-rabbit_confirms-logs && chmod 777 ct-rabbit_confirms-logs
         docker run \
@@ -2539,7 +2588,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_confirms-logs
         path: ct-rabbit_confirms-logs/*-ct-logs-*.tar.xz
@@ -2563,6 +2612,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_core_metrics_gc
+      id: tests
       run: |
         mkdir ct-rabbit_core_metrics_gc-logs && chmod 777 ct-rabbit_core_metrics_gc-logs
         docker run \
@@ -2575,7 +2625,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_core_metrics_gc-logs
         path: ct-rabbit_core_metrics_gc-logs/*-ct-logs-*.tar.xz
@@ -2599,6 +2649,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo
+      id: tests
       run: |
         mkdir ct-rabbit_fifo-logs && chmod 777 ct-rabbit_fifo-logs
         docker run \
@@ -2611,7 +2662,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo-logs
         path: ct-rabbit_fifo-logs/*-ct-logs-*.tar.xz
@@ -2635,6 +2686,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_int
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_int-logs && chmod 777 ct-rabbit_fifo_int-logs
         docker run \
@@ -2647,7 +2699,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_int-logs
         path: ct-rabbit_fifo_int-logs/*-ct-logs-*.tar.xz
@@ -2671,6 +2723,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_prop
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_prop-logs && chmod 777 ct-rabbit_fifo_prop-logs
         docker run \
@@ -2683,7 +2736,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_prop-logs
         path: ct-rabbit_fifo_prop-logs/*-ct-logs-*.tar.xz
@@ -2707,6 +2760,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_v0
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_v0-logs && chmod 777 ct-rabbit_fifo_v0-logs
         docker run \
@@ -2719,7 +2773,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_v0-logs
         path: ct-rabbit_fifo_v0-logs/*-ct-logs-*.tar.xz
@@ -2743,6 +2797,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_msg_record
+      id: tests
       run: |
         mkdir ct-rabbit_msg_record-logs && chmod 777 ct-rabbit_msg_record-logs
         docker run \
@@ -2755,7 +2810,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_msg_record-logs
         path: ct-rabbit_msg_record-logs/*-ct-logs-*.tar.xz
@@ -2779,6 +2834,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_stream_queue
+      id: tests
       run: |
         mkdir ct-rabbit_stream_queue-logs && chmod 777 ct-rabbit_stream_queue-logs
         docker run \
@@ -2791,7 +2847,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_stream_queue-logs
         path: ct-rabbit_stream_queue-logs/*-ct-logs-*.tar.xz
@@ -2815,6 +2871,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmq_queues_cli_integration
+      id: tests
       run: |
         mkdir ct-rabbitmq_queues_cli_integration-logs && chmod 777 ct-rabbitmq_queues_cli_integration-logs
         docker run \
@@ -2827,7 +2884,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmq_queues_cli_integration-logs
         path: ct-rabbitmq_queues_cli_integration-logs/*-ct-logs-*.tar.xz
@@ -2851,6 +2908,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmqctl_integration
+      id: tests
       run: |
         mkdir ct-rabbitmqctl_integration-logs && chmod 777 ct-rabbitmqctl_integration-logs
         docker run \
@@ -2863,7 +2921,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_integration-logs
         path: ct-rabbitmqctl_integration-logs/*-ct-logs-*.tar.xz
@@ -2887,6 +2945,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmqctl_shutdown
+      id: tests
       run: |
         mkdir ct-rabbitmqctl_shutdown-logs && chmod 777 ct-rabbitmqctl_shutdown-logs
         docker run \
@@ -2899,7 +2958,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_shutdown-logs
         path: ct-rabbitmqctl_shutdown-logs/*-ct-logs-*.tar.xz
@@ -2923,6 +2982,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-signal_handling
+      id: tests
       run: |
         mkdir ct-signal_handling-logs && chmod 777 ct-signal_handling-logs
         docker run \
@@ -2935,7 +2995,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-signal_handling-logs
         path: ct-signal_handling-logs/*-ct-logs-*.tar.xz
@@ -2959,6 +3019,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-simple_ha
+      id: tests
       run: |
         mkdir ct-simple_ha-logs && chmod 777 ct-simple_ha-logs
         docker run \
@@ -2971,7 +3032,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-simple_ha-logs
         path: ct-simple_ha-logs/*-ct-logs-*.tar.xz
@@ -2995,6 +3056,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-single_active_consumer
+      id: tests
       run: |
         mkdir ct-single_active_consumer-logs && chmod 777 ct-single_active_consumer-logs
         docker run \
@@ -3007,7 +3069,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-single_active_consumer-logs
         path: ct-single_active_consumer-logs/*-ct-logs-*.tar.xz
@@ -3031,6 +3093,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-sync_detection
+      id: tests
       run: |
         mkdir ct-sync_detection-logs && chmod 777 ct-sync_detection-logs
         docker run \
@@ -3043,7 +3106,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-sync_detection-logs
         path: ct-sync_detection-logs/*-ct-logs-*.tar.xz
@@ -3067,6 +3130,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-term_to_binary_compat_prop
+      id: tests
       run: |
         mkdir ct-term_to_binary_compat_prop-logs && chmod 777 ct-term_to_binary_compat_prop-logs
         docker run \
@@ -3079,7 +3143,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-term_to_binary_compat_prop-logs
         path: ct-term_to_binary_compat_prop-logs/*-ct-logs-*.tar.xz
@@ -3103,6 +3167,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-topic_permission
+      id: tests
       run: |
         mkdir ct-topic_permission-logs && chmod 777 ct-topic_permission-logs
         docker run \
@@ -3115,7 +3180,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-topic_permission-logs
         path: ct-topic_permission-logs/*-ct-logs-*.tar.xz
@@ -3139,6 +3204,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control
+      id: tests
       run: |
         mkdir ct-unit_access_control-logs && chmod 777 ct-unit_access_control-logs
         docker run \
@@ -3151,7 +3217,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control-logs
         path: ct-unit_access_control-logs/*-ct-logs-*.tar.xz
@@ -3175,6 +3241,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control_authn_authz_context_propagation
+      id: tests
       run: |
         mkdir ct-unit_access_control_authn_authz_context_propagation-logs && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs
         docker run \
@@ -3187,7 +3254,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs
         path: ct-unit_access_control_authn_authz_context_propagation-logs/*-ct-logs-*.tar.xz
@@ -3211,6 +3278,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control_credential_validation
+      id: tests
       run: |
         mkdir ct-unit_access_control_credential_validation-logs && chmod 777 ct-unit_access_control_credential_validation-logs
         docker run \
@@ -3223,7 +3291,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_credential_validation-logs
         path: ct-unit_access_control_credential_validation-logs/*-ct-logs-*.tar.xz
@@ -3247,6 +3315,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_amqp091_content_framing
+      id: tests
       run: |
         mkdir ct-unit_amqp091_content_framing-logs && chmod 777 ct-unit_amqp091_content_framing-logs
         docker run \
@@ -3259,7 +3328,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_content_framing-logs
         path: ct-unit_amqp091_content_framing-logs/*-ct-logs-*.tar.xz
@@ -3283,6 +3352,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_amqp091_server_properties
+      id: tests
       run: |
         mkdir ct-unit_amqp091_server_properties-logs && chmod 777 ct-unit_amqp091_server_properties-logs
         docker run \
@@ -3295,7 +3365,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_server_properties-logs
         path: ct-unit_amqp091_server_properties-logs/*-ct-logs-*.tar.xz
@@ -3319,6 +3389,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_app_management
+      id: tests
       run: |
         mkdir ct-unit_app_management-logs && chmod 777 ct-unit_app_management-logs
         docker run \
@@ -3331,7 +3402,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_app_management-logs
         path: ct-unit_app_management-logs/*-ct-logs-*.tar.xz
@@ -3355,6 +3426,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_cluster_formation_locking_mocks
+      id: tests
       run: |
         mkdir ct-unit_cluster_formation_locking_mocks-logs && chmod 777 ct-unit_cluster_formation_locking_mocks-logs
         docker run \
@@ -3367,7 +3439,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_cluster_formation_locking_mocks-logs
         path: ct-unit_cluster_formation_locking_mocks-logs/*-ct-logs-*.tar.xz
@@ -3391,6 +3463,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_collections
+      id: tests
       run: |
         mkdir ct-unit_collections-logs && chmod 777 ct-unit_collections-logs
         docker run \
@@ -3403,7 +3476,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_collections-logs
         path: ct-unit_collections-logs/*-ct-logs-*.tar.xz
@@ -3427,6 +3500,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_config_value_encryption
+      id: tests
       run: |
         mkdir ct-unit_config_value_encryption-logs && chmod 777 ct-unit_config_value_encryption-logs
         docker run \
@@ -3439,7 +3513,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_config_value_encryption-logs
         path: ct-unit_config_value_encryption-logs/*-ct-logs-*.tar.xz
@@ -3463,6 +3537,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_connection_tracking
+      id: tests
       run: |
         mkdir ct-unit_connection_tracking-logs && chmod 777 ct-unit_connection_tracking-logs
         docker run \
@@ -3475,7 +3550,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_connection_tracking-logs
         path: ct-unit_connection_tracking-logs/*-ct-logs-*.tar.xz
@@ -3499,6 +3574,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_credit_flow
+      id: tests
       run: |
         mkdir ct-unit_credit_flow-logs && chmod 777 ct-unit_credit_flow-logs
         docker run \
@@ -3511,7 +3587,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_credit_flow-logs
         path: ct-unit_credit_flow-logs/*-ct-logs-*.tar.xz
@@ -3535,6 +3611,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_disk_monitor
+      id: tests
       run: |
         mkdir ct-unit_disk_monitor-logs && chmod 777 ct-unit_disk_monitor-logs
         docker run \
@@ -3547,7 +3624,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor-logs
         path: ct-unit_disk_monitor-logs/*-ct-logs-*.tar.xz
@@ -3571,6 +3648,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_disk_monitor_mocks
+      id: tests
       run: |
         mkdir ct-unit_disk_monitor_mocks-logs && chmod 777 ct-unit_disk_monitor_mocks-logs
         docker run \
@@ -3583,7 +3661,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor_mocks-logs
         path: ct-unit_disk_monitor_mocks-logs/*-ct-logs-*.tar.xz
@@ -3607,6 +3685,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_file_handle_cache
+      id: tests
       run: |
         mkdir ct-unit_file_handle_cache-logs && chmod 777 ct-unit_file_handle_cache-logs
         docker run \
@@ -3619,7 +3698,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_file_handle_cache-logs
         path: ct-unit_file_handle_cache-logs/*-ct-logs-*.tar.xz
@@ -3643,6 +3722,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_gen_server2
+      id: tests
       run: |
         mkdir ct-unit_gen_server2-logs && chmod 777 ct-unit_gen_server2-logs
         docker run \
@@ -3655,7 +3735,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gen_server2-logs
         path: ct-unit_gen_server2-logs/*-ct-logs-*.tar.xz
@@ -3679,6 +3759,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_gm
+      id: tests
       run: |
         mkdir ct-unit_gm-logs && chmod 777 ct-unit_gm-logs
         docker run \
@@ -3691,7 +3772,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gm-logs
         path: ct-unit_gm-logs/*-ct-logs-*.tar.xz
@@ -3715,6 +3796,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_log_config
+      id: tests
       run: |
         mkdir ct-unit_log_config-logs && chmod 777 ct-unit_log_config-logs
         docker run \
@@ -3727,7 +3809,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_config-logs
         path: ct-unit_log_config-logs/*-ct-logs-*.tar.xz
@@ -3751,6 +3833,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_log_management
+      id: tests
       run: |
         mkdir ct-unit_log_management-logs && chmod 777 ct-unit_log_management-logs
         docker run \
@@ -3763,7 +3846,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_management-logs
         path: ct-unit_log_management-logs/*-ct-logs-*.tar.xz
@@ -3787,6 +3870,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_operator_policy
+      id: tests
       run: |
         mkdir ct-unit_operator_policy-logs && chmod 777 ct-unit_operator_policy-logs
         docker run \
@@ -3799,7 +3883,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_operator_policy-logs
         path: ct-unit_operator_policy-logs/*-ct-logs-*.tar.xz
@@ -3823,6 +3907,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_pg_local
+      id: tests
       run: |
         mkdir ct-unit_pg_local-logs && chmod 777 ct-unit_pg_local-logs
         docker run \
@@ -3835,7 +3920,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_pg_local-logs
         path: ct-unit_pg_local-logs/*-ct-logs-*.tar.xz
@@ -3859,6 +3944,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_plugin_directories
+      id: tests
       run: |
         mkdir ct-unit_plugin_directories-logs && chmod 777 ct-unit_plugin_directories-logs
         docker run \
@@ -3871,7 +3957,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_directories-logs
         path: ct-unit_plugin_directories-logs/*-ct-logs-*.tar.xz
@@ -3895,6 +3981,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_plugin_versioning
+      id: tests
       run: |
         mkdir ct-unit_plugin_versioning-logs && chmod 777 ct-unit_plugin_versioning-logs
         docker run \
@@ -3907,7 +3994,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_versioning-logs
         path: ct-unit_plugin_versioning-logs/*-ct-logs-*.tar.xz
@@ -3931,6 +4018,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_policy_validators
+      id: tests
       run: |
         mkdir ct-unit_policy_validators-logs && chmod 777 ct-unit_policy_validators-logs
         docker run \
@@ -3943,7 +4031,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_policy_validators-logs
         path: ct-unit_policy_validators-logs/*-ct-logs-*.tar.xz
@@ -3967,6 +4055,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_priority_queue
+      id: tests
       run: |
         mkdir ct-unit_priority_queue-logs && chmod 777 ct-unit_priority_queue-logs
         docker run \
@@ -3979,7 +4068,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_priority_queue-logs
         path: ct-unit_priority_queue-logs/*-ct-logs-*.tar.xz
@@ -4003,6 +4092,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_queue_consumers
+      id: tests
       run: |
         mkdir ct-unit_queue_consumers-logs && chmod 777 ct-unit_queue_consumers-logs
         docker run \
@@ -4015,7 +4105,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_queue_consumers-logs
         path: ct-unit_queue_consumers-logs/*-ct-logs-*.tar.xz
@@ -4039,6 +4129,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_stats_and_metrics
+      id: tests
       run: |
         mkdir ct-unit_stats_and_metrics-logs && chmod 777 ct-unit_stats_and_metrics-logs
         docker run \
@@ -4051,7 +4142,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_stats_and_metrics-logs
         path: ct-unit_stats_and_metrics-logs/*-ct-logs-*.tar.xz
@@ -4075,6 +4166,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_supervisor2
+      id: tests
       run: |
         mkdir ct-unit_supervisor2-logs && chmod 777 ct-unit_supervisor2-logs
         docker run \
@@ -4087,7 +4179,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_supervisor2-logs
         path: ct-unit_supervisor2-logs/*-ct-logs-*.tar.xz
@@ -4111,6 +4203,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_vm_memory_monitor
+      id: tests
       run: |
         mkdir ct-unit_vm_memory_monitor-logs && chmod 777 ct-unit_vm_memory_monitor-logs
         docker run \
@@ -4123,7 +4216,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_vm_memory_monitor-logs
         path: ct-unit_vm_memory_monitor-logs/*-ct-logs-*.tar.xz
@@ -4147,6 +4240,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-upgrade_preparation
+      id: tests
       run: |
         mkdir ct-upgrade_preparation-logs && chmod 777 ct-upgrade_preparation-logs
         docker run \
@@ -4159,7 +4253,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-upgrade_preparation-logs
         path: ct-upgrade_preparation-logs/*-ct-logs-*.tar.xz
@@ -4183,6 +4277,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-vhost
+      id: tests
       run: |
         mkdir ct-vhost-logs && chmod 777 ct-vhost-logs
         docker run \
@@ -4195,7 +4290,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-vhost-logs
         path: ct-vhost-logs/*-ct-logs-*.tar.xz
diff --git a/.github/workflows/test-erlang-otp-git.yaml b/.github/workflows/test-erlang-otp-git.yaml
index 48dc29a971..4557c7f90a 100644
--- a/.github/workflows/test-erlang-otp-git.yaml
+++ b/.github/workflows/test-erlang-otp-git.yaml
@@ -665,6 +665,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-amqqueue_backward_compatibility
+      id: tests
       run: |
         mkdir ct-amqqueue_backward_compatibility-logs && chmod 777 ct-amqqueue_backward_compatibility-logs
         docker run \
@@ -677,7 +678,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-amqqueue_backward_compatibility-logs
         path: ct-amqqueue_backward_compatibility-logs/*-ct-logs-*.tar.xz
@@ -701,6 +702,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-backing_queue
+      id: tests
       run: |
         mkdir ct-backing_queue-logs && chmod 777 ct-backing_queue-logs
         docker run \
@@ -713,7 +715,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-backing_queue-logs
         path: ct-backing_queue-logs/*-ct-logs-*.tar.xz
@@ -737,6 +739,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-channel_interceptor
+      id: tests
       run: |
         mkdir ct-channel_interceptor-logs && chmod 777 ct-channel_interceptor-logs
         docker run \
@@ -749,7 +752,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-channel_interceptor-logs
         path: ct-channel_interceptor-logs/*-ct-logs-*.tar.xz
@@ -773,6 +776,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-channel_operation_timeout
+      id: tests
       run: |
         mkdir ct-channel_operation_timeout-logs && chmod 777 ct-channel_operation_timeout-logs
         docker run \
@@ -785,7 +789,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-channel_operation_timeout-logs
         path: ct-channel_operation_timeout-logs/*-ct-logs-*.tar.xz
@@ -809,6 +813,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-cluster
+      id: tests
       run: |
         mkdir ct-cluster-logs && chmod 777 ct-cluster-logs
         docker run \
@@ -821,7 +826,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-cluster-logs
         path: ct-cluster-logs/*-ct-logs-*.tar.xz
@@ -845,6 +850,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-cluster_rename
+      id: tests
       run: |
         mkdir ct-cluster_rename-logs && chmod 777 ct-cluster_rename-logs
         docker run \
@@ -857,7 +863,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-cluster_rename-logs
         path: ct-cluster_rename-logs/*-ct-logs-*.tar.xz
@@ -881,6 +887,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-clustering_management
+      id: tests
       run: |
         mkdir ct-clustering_management-logs && chmod 777 ct-clustering_management-logs
         docker run \
@@ -893,7 +900,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-clustering_management-logs
         path: ct-clustering_management-logs/*-ct-logs-*.tar.xz
@@ -917,6 +924,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-config_schema
+      id: tests
       run: |
         mkdir ct-config_schema-logs && chmod 777 ct-config_schema-logs
         docker run \
@@ -929,7 +937,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-config_schema-logs
         path: ct-config_schema-logs/*-ct-logs-*.tar.xz
@@ -953,6 +961,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-confirms_rejects
+      id: tests
       run: |
         mkdir ct-confirms_rejects-logs && chmod 777 ct-confirms_rejects-logs
         docker run \
@@ -965,7 +974,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-confirms_rejects-logs
         path: ct-confirms_rejects-logs/*-ct-logs-*.tar.xz
@@ -989,6 +998,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-consumer_timeout
+      id: tests
       run: |
         mkdir ct-consumer_timeout-logs && chmod 777 ct-consumer_timeout-logs
         docker run \
@@ -1001,7 +1011,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-consumer_timeout-logs
         path: ct-consumer_timeout-logs/*-ct-logs-*.tar.xz
@@ -1025,6 +1035,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-crashing_queues
+      id: tests
       run: |
         mkdir ct-crashing_queues-logs && chmod 777 ct-crashing_queues-logs
         docker run \
@@ -1037,7 +1048,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-crashing_queues-logs
         path: ct-crashing_queues-logs/*-ct-logs-*.tar.xz
@@ -1061,6 +1072,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-dead_lettering
+      id: tests
       run: |
         mkdir ct-dead_lettering-logs && chmod 777 ct-dead_lettering-logs
         docker run \
@@ -1073,7 +1085,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dead_lettering-logs
         path: ct-dead_lettering-logs/*-ct-logs-*.tar.xz
@@ -1097,6 +1109,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-definition_import
+      id: tests
       run: |
         mkdir ct-definition_import-logs && chmod 777 ct-definition_import-logs
         docker run \
@@ -1109,7 +1122,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-definition_import-logs
         path: ct-definition_import-logs/*-ct-logs-*.tar.xz
@@ -1133,6 +1146,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-disconnect_detected_during_alarm
+      id: tests
       run: |
         mkdir ct-disconnect_detected_during_alarm-logs && chmod 777 ct-disconnect_detected_during_alarm-logs
         docker run \
@@ -1145,7 +1159,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-disconnect_detected_during_alarm-logs
         path: ct-disconnect_detected_during_alarm-logs/*-ct-logs-*.tar.xz
@@ -1169,6 +1183,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-dynamic_ha
+      id: tests
       run: |
         mkdir ct-dynamic_ha-logs && chmod 777 ct-dynamic_ha-logs
         docker run \
@@ -1181,7 +1196,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_ha-logs
         path: ct-dynamic_ha-logs/*-ct-logs-*.tar.xz
@@ -1205,6 +1220,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-dynamic_qq
+      id: tests
       run: |
         mkdir ct-dynamic_qq-logs && chmod 777 ct-dynamic_qq-logs
         docker run \
@@ -1217,7 +1233,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-dynamic_qq-logs
         path: ct-dynamic_qq-logs/*-ct-logs-*.tar.xz
@@ -1241,6 +1257,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-eager_sync
+      id: tests
       run: |
         mkdir ct-eager_sync-logs && chmod 777 ct-eager_sync-logs
         docker run \
@@ -1253,7 +1270,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-eager_sync-logs
         path: ct-eager_sync-logs/*-ct-logs-*.tar.xz
@@ -1277,6 +1294,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-feature_flags
+      id: tests
       run: |
         mkdir ct-feature_flags-logs && chmod 777 ct-feature_flags-logs
         docker run \
@@ -1289,7 +1307,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-feature_flags-logs
         path: ct-feature_flags-logs/*-ct-logs-*.tar.xz
@@ -1313,6 +1331,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-lazy_queue
+      id: tests
       run: |
         mkdir ct-lazy_queue-logs && chmod 777 ct-lazy_queue-logs
         docker run \
@@ -1325,7 +1344,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-lazy_queue-logs
         path: ct-lazy_queue-logs/*-ct-logs-*.tar.xz
@@ -1349,6 +1368,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-list_consumers_sanity_check
+      id: tests
       run: |
         mkdir ct-list_consumers_sanity_check-logs && chmod 777 ct-list_consumers_sanity_check-logs
         docker run \
@@ -1361,7 +1381,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-list_consumers_sanity_check-logs
         path: ct-list_consumers_sanity_check-logs/*-ct-logs-*.tar.xz
@@ -1385,6 +1405,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-list_queues_online_and_offline
+      id: tests
       run: |
         mkdir ct-list_queues_online_and_offline-logs && chmod 777 ct-list_queues_online_and_offline-logs
         docker run \
@@ -1397,7 +1418,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-list_queues_online_and_offline-logs
         path: ct-list_queues_online_and_offline-logs/*-ct-logs-*.tar.xz
@@ -1421,6 +1442,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-maintenance_mode
+      id: tests
       run: |
         mkdir ct-maintenance_mode-logs && chmod 777 ct-maintenance_mode-logs
         docker run \
@@ -1433,7 +1455,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-maintenance_mode-logs
         path: ct-maintenance_mode-logs/*-ct-logs-*.tar.xz
@@ -1457,6 +1479,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-many_node_ha
+      id: tests
       run: |
         mkdir ct-many_node_ha-logs && chmod 777 ct-many_node_ha-logs
         docker run \
@@ -1469,7 +1492,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-many_node_ha-logs
         path: ct-many_node_ha-logs/*-ct-logs-*.tar.xz
@@ -1493,6 +1516,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-message_size_limit
+      id: tests
       run: |
         mkdir ct-message_size_limit-logs && chmod 777 ct-message_size_limit-logs
         docker run \
@@ -1505,7 +1529,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-message_size_limit-logs
         path: ct-message_size_limit-logs/*-ct-logs-*.tar.xz
@@ -1529,6 +1553,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-metrics
+      id: tests
       run: |
         mkdir ct-metrics-logs && chmod 777 ct-metrics-logs
         docker run \
@@ -1541,7 +1566,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-metrics-logs
         path: ct-metrics-logs/*-ct-logs-*.tar.xz
@@ -1565,6 +1590,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-mirrored_supervisor
+      id: tests
       run: |
         mkdir ct-mirrored_supervisor-logs && chmod 777 ct-mirrored_supervisor-logs
         docker run \
@@ -1577,7 +1603,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-mirrored_supervisor-logs
         path: ct-mirrored_supervisor-logs/*-ct-logs-*.tar.xz
@@ -1601,6 +1627,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-msg_store
+      id: tests
       run: |
         mkdir ct-msg_store-logs && chmod 777 ct-msg_store-logs
         docker run \
@@ -1613,7 +1640,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-msg_store-logs
         path: ct-msg_store-logs/*-ct-logs-*.tar.xz
@@ -1637,6 +1664,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-peer_discovery_classic_config
+      id: tests
       run: |
         mkdir ct-peer_discovery_classic_config-logs && chmod 777 ct-peer_discovery_classic_config-logs
         docker run \
@@ -1649,7 +1677,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_classic_config-logs
         path: ct-peer_discovery_classic_config-logs/*-ct-logs-*.tar.xz
@@ -1673,6 +1701,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-peer_discovery_dns
+      id: tests
       run: |
         mkdir ct-peer_discovery_dns-logs && chmod 777 ct-peer_discovery_dns-logs
         docker run \
@@ -1685,7 +1714,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-peer_discovery_dns-logs
         path: ct-peer_discovery_dns-logs/*-ct-logs-*.tar.xz
@@ -1709,6 +1738,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_limit
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_limit-logs && chmod 777 ct-per_user_connection_channel_limit-logs
         docker run \
@@ -1721,7 +1751,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit-logs
         path: ct-per_user_connection_channel_limit-logs/*-ct-logs-*.tar.xz
@@ -1745,6 +1775,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_limit_partitions
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_limit_partitions-logs && chmod 777 ct-per_user_connection_channel_limit_partitions-logs
         docker run \
@@ -1757,7 +1788,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_limit_partitions-logs
         path: ct-per_user_connection_channel_limit_partitions-logs/*-ct-logs-*.tar.xz
@@ -1781,6 +1812,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_channel_tracking
+      id: tests
       run: |
         mkdir ct-per_user_connection_channel_tracking-logs && chmod 777 ct-per_user_connection_channel_tracking-logs
         docker run \
@@ -1793,7 +1825,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_channel_tracking-logs
         path: ct-per_user_connection_channel_tracking-logs/*-ct-logs-*.tar.xz
@@ -1817,6 +1849,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_user_connection_tracking
+      id: tests
       run: |
         mkdir ct-per_user_connection_tracking-logs && chmod 777 ct-per_user_connection_tracking-logs
         docker run \
@@ -1829,7 +1862,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_user_connection_tracking-logs
         path: ct-per_user_connection_tracking-logs/*-ct-logs-*.tar.xz
@@ -1853,6 +1886,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_connection_limit
+      id: tests
       run: |
         mkdir ct-per_vhost_connection_limit-logs && chmod 777 ct-per_vhost_connection_limit-logs
         docker run \
@@ -1865,7 +1899,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit-logs
         path: ct-per_vhost_connection_limit-logs/*-ct-logs-*.tar.xz
@@ -1889,6 +1923,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_connection_limit_partitions
+      id: tests
       run: |
         mkdir ct-per_vhost_connection_limit_partitions-logs && chmod 777 ct-per_vhost_connection_limit_partitions-logs
         docker run \
@@ -1901,7 +1936,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_connection_limit_partitions-logs
         path: ct-per_vhost_connection_limit_partitions-logs/*-ct-logs-*.tar.xz
@@ -1925,6 +1960,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_msg_store
+      id: tests
       run: |
         mkdir ct-per_vhost_msg_store-logs && chmod 777 ct-per_vhost_msg_store-logs
         docker run \
@@ -1937,7 +1973,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_msg_store-logs
         path: ct-per_vhost_msg_store-logs/*-ct-logs-*.tar.xz
@@ -1961,6 +1997,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-per_vhost_queue_limit
+      id: tests
       run: |
         mkdir ct-per_vhost_queue_limit-logs && chmod 777 ct-per_vhost_queue_limit-logs
         docker run \
@@ -1973,7 +2010,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-per_vhost_queue_limit-logs
         path: ct-per_vhost_queue_limit-logs/*-ct-logs-*.tar.xz
@@ -1997,6 +2034,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-policy
+      id: tests
       run: |
         mkdir ct-policy-logs && chmod 777 ct-policy-logs
         docker run \
@@ -2009,7 +2047,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-policy-logs
         path: ct-policy-logs/*-ct-logs-*.tar.xz
@@ -2033,6 +2071,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-priority_queue
+      id: tests
       run: |
         mkdir ct-priority_queue-logs && chmod 777 ct-priority_queue-logs
         docker run \
@@ -2045,7 +2084,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue-logs
         path: ct-priority_queue-logs/*-ct-logs-*.tar.xz
@@ -2069,6 +2108,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-priority_queue_recovery
+      id: tests
       run: |
         mkdir ct-priority_queue_recovery-logs && chmod 777 ct-priority_queue_recovery-logs
         docker run \
@@ -2081,7 +2121,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-priority_queue_recovery-logs
         path: ct-priority_queue_recovery-logs/*-ct-logs-*.tar.xz
@@ -2105,6 +2145,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-product_info
+      id: tests
       run: |
         mkdir ct-product_info-logs && chmod 777 ct-product_info-logs
         docker run \
@@ -2117,7 +2158,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-product_info-logs
         path: ct-product_info-logs/*-ct-logs-*.tar.xz
@@ -2141,6 +2182,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-proxy_protocol
+      id: tests
       run: |
         mkdir ct-proxy_protocol-logs && chmod 777 ct-proxy_protocol-logs
         docker run \
@@ -2153,7 +2195,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-proxy_protocol-logs
         path: ct-proxy_protocol-logs/*-ct-logs-*.tar.xz
@@ -2177,6 +2219,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-publisher_confirms_parallel
+      id: tests
       run: |
         mkdir ct-publisher_confirms_parallel-logs && chmod 777 ct-publisher_confirms_parallel-logs
         docker run \
@@ -2189,7 +2232,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-publisher_confirms_parallel-logs
         path: ct-publisher_confirms_parallel-logs/*-ct-logs-*.tar.xz
@@ -2213,6 +2256,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_length_limits
+      id: tests
       run: |
         mkdir ct-queue_length_limits-logs && chmod 777 ct-queue_length_limits-logs
         docker run \
@@ -2225,7 +2269,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_length_limits-logs
         path: ct-queue_length_limits-logs/*-ct-logs-*.tar.xz
@@ -2249,6 +2293,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_master_location
+      id: tests
       run: |
         mkdir ct-queue_master_location-logs && chmod 777 ct-queue_master_location-logs
         docker run \
@@ -2261,7 +2306,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_master_location-logs
         path: ct-queue_master_location-logs/*-ct-logs-*.tar.xz
@@ -2285,6 +2330,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_parallel
+      id: tests
       run: |
         mkdir ct-queue_parallel-logs && chmod 777 ct-queue_parallel-logs
         docker run \
@@ -2297,7 +2343,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_parallel-logs
         path: ct-queue_parallel-logs/*-ct-logs-*.tar.xz
@@ -2321,6 +2367,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_type
+      id: tests
       run: |
         mkdir ct-queue_type-logs && chmod 777 ct-queue_type-logs
         docker run \
@@ -2333,7 +2380,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-queue_type-logs
         path: ct-queue_type-logs/*-ct-logs-*.tar.xz
@@ -2357,6 +2404,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-quorum_queue
+      id: tests
       run: |
         mkdir ct-quorum_queue-logs && chmod 777 ct-quorum_queue-logs
         docker run \
@@ -2369,7 +2417,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-quorum_queue-logs
         path: ct-quorum_queue-logs/*-ct-logs-*.tar.xz
@@ -2393,6 +2441,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_confirms
+      id: tests
       run: |
         mkdir ct-rabbit_confirms-logs && chmod 777 ct-rabbit_confirms-logs
         docker run \
@@ -2405,7 +2454,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_confirms-logs
         path: ct-rabbit_confirms-logs/*-ct-logs-*.tar.xz
@@ -2429,6 +2478,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_core_metrics_gc
+      id: tests
       run: |
         mkdir ct-rabbit_core_metrics_gc-logs && chmod 777 ct-rabbit_core_metrics_gc-logs
         docker run \
@@ -2441,7 +2491,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_core_metrics_gc-logs
         path: ct-rabbit_core_metrics_gc-logs/*-ct-logs-*.tar.xz
@@ -2465,6 +2515,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo
+      id: tests
       run: |
         mkdir ct-rabbit_fifo-logs && chmod 777 ct-rabbit_fifo-logs
         docker run \
@@ -2477,7 +2528,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo-logs
         path: ct-rabbit_fifo-logs/*-ct-logs-*.tar.xz
@@ -2501,6 +2552,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_int
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_int-logs && chmod 777 ct-rabbit_fifo_int-logs
         docker run \
@@ -2513,7 +2565,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_int-logs
         path: ct-rabbit_fifo_int-logs/*-ct-logs-*.tar.xz
@@ -2537,6 +2589,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_prop
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_prop-logs && chmod 777 ct-rabbit_fifo_prop-logs
         docker run \
@@ -2549,7 +2602,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_prop-logs
         path: ct-rabbit_fifo_prop-logs/*-ct-logs-*.tar.xz
@@ -2573,6 +2626,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_v0
+      id: tests
       run: |
         mkdir ct-rabbit_fifo_v0-logs && chmod 777 ct-rabbit_fifo_v0-logs
         docker run \
@@ -2585,7 +2639,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_fifo_v0-logs
         path: ct-rabbit_fifo_v0-logs/*-ct-logs-*.tar.xz
@@ -2609,6 +2663,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_msg_record
+      id: tests
       run: |
         mkdir ct-rabbit_msg_record-logs && chmod 777 ct-rabbit_msg_record-logs
         docker run \
@@ -2621,7 +2676,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_msg_record-logs
         path: ct-rabbit_msg_record-logs/*-ct-logs-*.tar.xz
@@ -2645,6 +2700,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_stream_queue
+      id: tests
       run: |
         mkdir ct-rabbit_stream_queue-logs && chmod 777 ct-rabbit_stream_queue-logs
         docker run \
@@ -2657,7 +2713,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbit_stream_queue-logs
         path: ct-rabbit_stream_queue-logs/*-ct-logs-*.tar.xz
@@ -2681,6 +2737,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmq_queues_cli_integration
+      id: tests
       run: |
         mkdir ct-rabbitmq_queues_cli_integration-logs && chmod 777 ct-rabbitmq_queues_cli_integration-logs
         docker run \
@@ -2693,7 +2750,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmq_queues_cli_integration-logs
         path: ct-rabbitmq_queues_cli_integration-logs/*-ct-logs-*.tar.xz
@@ -2717,6 +2774,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmqctl_integration
+      id: tests
       run: |
         mkdir ct-rabbitmqctl_integration-logs && chmod 777 ct-rabbitmqctl_integration-logs
         docker run \
@@ -2729,7 +2787,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_integration-logs
         path: ct-rabbitmqctl_integration-logs/*-ct-logs-*.tar.xz
@@ -2753,6 +2811,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbitmqctl_shutdown
+      id: tests
       run: |
         mkdir ct-rabbitmqctl_shutdown-logs && chmod 777 ct-rabbitmqctl_shutdown-logs
         docker run \
@@ -2765,7 +2824,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-rabbitmqctl_shutdown-logs
         path: ct-rabbitmqctl_shutdown-logs/*-ct-logs-*.tar.xz
@@ -2789,6 +2848,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-signal_handling
+      id: tests
       run: |
         mkdir ct-signal_handling-logs && chmod 777 ct-signal_handling-logs
         docker run \
@@ -2801,7 +2861,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-signal_handling-logs
         path: ct-signal_handling-logs/*-ct-logs-*.tar.xz
@@ -2825,6 +2885,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-simple_ha
+      id: tests
       run: |
         mkdir ct-simple_ha-logs && chmod 777 ct-simple_ha-logs
         docker run \
@@ -2837,7 +2898,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-simple_ha-logs
         path: ct-simple_ha-logs/*-ct-logs-*.tar.xz
@@ -2861,6 +2922,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-single_active_consumer
+      id: tests
       run: |
         mkdir ct-single_active_consumer-logs && chmod 777 ct-single_active_consumer-logs
         docker run \
@@ -2873,7 +2935,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-single_active_consumer-logs
         path: ct-single_active_consumer-logs/*-ct-logs-*.tar.xz
@@ -2897,6 +2959,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-sync_detection
+      id: tests
       run: |
         mkdir ct-sync_detection-logs && chmod 777 ct-sync_detection-logs
         docker run \
@@ -2909,7 +2972,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-sync_detection-logs
         path: ct-sync_detection-logs/*-ct-logs-*.tar.xz
@@ -2933,6 +2996,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-term_to_binary_compat_prop
+      id: tests
       run: |
         mkdir ct-term_to_binary_compat_prop-logs && chmod 777 ct-term_to_binary_compat_prop-logs
         docker run \
@@ -2945,7 +3009,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-term_to_binary_compat_prop-logs
         path: ct-term_to_binary_compat_prop-logs/*-ct-logs-*.tar.xz
@@ -2969,6 +3033,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-topic_permission
+      id: tests
       run: |
         mkdir ct-topic_permission-logs && chmod 777 ct-topic_permission-logs
         docker run \
@@ -2981,7 +3046,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-topic_permission-logs
         path: ct-topic_permission-logs/*-ct-logs-*.tar.xz
@@ -3005,6 +3070,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control
+      id: tests
       run: |
         mkdir ct-unit_access_control-logs && chmod 777 ct-unit_access_control-logs
         docker run \
@@ -3017,7 +3083,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control-logs
         path: ct-unit_access_control-logs/*-ct-logs-*.tar.xz
@@ -3041,6 +3107,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control_authn_authz_context_propagation
+      id: tests
       run: |
         mkdir ct-unit_access_control_authn_authz_context_propagation-logs && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs
         docker run \
@@ -3053,7 +3120,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs
         path: ct-unit_access_control_authn_authz_context_propagation-logs/*-ct-logs-*.tar.xz
@@ -3077,6 +3144,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control_credential_validation
+      id: tests
       run: |
         mkdir ct-unit_access_control_credential_validation-logs && chmod 777 ct-unit_access_control_credential_validation-logs
         docker run \
@@ -3089,7 +3157,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_access_control_credential_validation-logs
         path: ct-unit_access_control_credential_validation-logs/*-ct-logs-*.tar.xz
@@ -3113,6 +3181,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_amqp091_content_framing
+      id: tests
       run: |
         mkdir ct-unit_amqp091_content_framing-logs && chmod 777 ct-unit_amqp091_content_framing-logs
         docker run \
@@ -3125,7 +3194,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_content_framing-logs
         path: ct-unit_amqp091_content_framing-logs/*-ct-logs-*.tar.xz
@@ -3149,6 +3218,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_amqp091_server_properties
+      id: tests
       run: |
         mkdir ct-unit_amqp091_server_properties-logs && chmod 777 ct-unit_amqp091_server_properties-logs
         docker run \
@@ -3161,7 +3231,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_amqp091_server_properties-logs
         path: ct-unit_amqp091_server_properties-logs/*-ct-logs-*.tar.xz
@@ -3185,6 +3255,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_app_management
+      id: tests
       run: |
         mkdir ct-unit_app_management-logs && chmod 777 ct-unit_app_management-logs
         docker run \
@@ -3197,7 +3268,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_app_management-logs
         path: ct-unit_app_management-logs/*-ct-logs-*.tar.xz
@@ -3221,6 +3292,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_cluster_formation_locking_mocks
+      id: tests
       run: |
         mkdir ct-unit_cluster_formation_locking_mocks-logs && chmod 777 ct-unit_cluster_formation_locking_mocks-logs
         docker run \
@@ -3233,7 +3305,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_cluster_formation_locking_mocks-logs
         path: ct-unit_cluster_formation_locking_mocks-logs/*-ct-logs-*.tar.xz
@@ -3257,6 +3329,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_collections
+      id: tests
       run: |
         mkdir ct-unit_collections-logs && chmod 777 ct-unit_collections-logs
         docker run \
@@ -3269,7 +3342,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_collections-logs
         path: ct-unit_collections-logs/*-ct-logs-*.tar.xz
@@ -3293,6 +3366,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_config_value_encryption
+      id: tests
       run: |
         mkdir ct-unit_config_value_encryption-logs && chmod 777 ct-unit_config_value_encryption-logs
         docker run \
@@ -3305,7 +3379,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_config_value_encryption-logs
         path: ct-unit_config_value_encryption-logs/*-ct-logs-*.tar.xz
@@ -3329,6 +3403,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_connection_tracking
+      id: tests
       run: |
         mkdir ct-unit_connection_tracking-logs && chmod 777 ct-unit_connection_tracking-logs
         docker run \
@@ -3341,7 +3416,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_connection_tracking-logs
         path: ct-unit_connection_tracking-logs/*-ct-logs-*.tar.xz
@@ -3365,6 +3440,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_credit_flow
+      id: tests
       run: |
         mkdir ct-unit_credit_flow-logs && chmod 777 ct-unit_credit_flow-logs
         docker run \
@@ -3377,7 +3453,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_credit_flow-logs
         path: ct-unit_credit_flow-logs/*-ct-logs-*.tar.xz
@@ -3401,6 +3477,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_disk_monitor
+      id: tests
       run: |
         mkdir ct-unit_disk_monitor-logs && chmod 777 ct-unit_disk_monitor-logs
         docker run \
@@ -3413,7 +3490,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor-logs
         path: ct-unit_disk_monitor-logs/*-ct-logs-*.tar.xz
@@ -3437,6 +3514,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_disk_monitor_mocks
+      id: tests
       run: |
         mkdir ct-unit_disk_monitor_mocks-logs && chmod 777 ct-unit_disk_monitor_mocks-logs
         docker run \
@@ -3449,7 +3527,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_disk_monitor_mocks-logs
         path: ct-unit_disk_monitor_mocks-logs/*-ct-logs-*.tar.xz
@@ -3473,6 +3551,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_file_handle_cache
+      id: tests
       run: |
         mkdir ct-unit_file_handle_cache-logs && chmod 777 ct-unit_file_handle_cache-logs
         docker run \
@@ -3485,7 +3564,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_file_handle_cache-logs
         path: ct-unit_file_handle_cache-logs/*-ct-logs-*.tar.xz
@@ -3509,6 +3588,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_gen_server2
+      id: tests
       run: |
         mkdir ct-unit_gen_server2-logs && chmod 777 ct-unit_gen_server2-logs
         docker run \
@@ -3521,7 +3601,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gen_server2-logs
         path: ct-unit_gen_server2-logs/*-ct-logs-*.tar.xz
@@ -3545,6 +3625,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_gm
+      id: tests
       run: |
         mkdir ct-unit_gm-logs && chmod 777 ct-unit_gm-logs
         docker run \
@@ -3557,7 +3638,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_gm-logs
         path: ct-unit_gm-logs/*-ct-logs-*.tar.xz
@@ -3581,6 +3662,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_log_config
+      id: tests
       run: |
         mkdir ct-unit_log_config-logs && chmod 777 ct-unit_log_config-logs
         docker run \
@@ -3593,7 +3675,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_config-logs
         path: ct-unit_log_config-logs/*-ct-logs-*.tar.xz
@@ -3617,6 +3699,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_log_management
+      id: tests
       run: |
         mkdir ct-unit_log_management-logs && chmod 777 ct-unit_log_management-logs
         docker run \
@@ -3629,7 +3712,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_log_management-logs
         path: ct-unit_log_management-logs/*-ct-logs-*.tar.xz
@@ -3653,6 +3736,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_operator_policy
+      id: tests
       run: |
         mkdir ct-unit_operator_policy-logs && chmod 777 ct-unit_operator_policy-logs
         docker run \
@@ -3665,7 +3749,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_operator_policy-logs
         path: ct-unit_operator_policy-logs/*-ct-logs-*.tar.xz
@@ -3689,6 +3773,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_pg_local
+      id: tests
       run: |
         mkdir ct-unit_pg_local-logs && chmod 777 ct-unit_pg_local-logs
         docker run \
@@ -3701,7 +3786,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_pg_local-logs
         path: ct-unit_pg_local-logs/*-ct-logs-*.tar.xz
@@ -3725,6 +3810,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_plugin_directories
+      id: tests
       run: |
         mkdir ct-unit_plugin_directories-logs && chmod 777 ct-unit_plugin_directories-logs
         docker run \
@@ -3737,7 +3823,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_directories-logs
         path: ct-unit_plugin_directories-logs/*-ct-logs-*.tar.xz
@@ -3761,6 +3847,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_plugin_versioning
+      id: tests
       run: |
         mkdir ct-unit_plugin_versioning-logs && chmod 777 ct-unit_plugin_versioning-logs
         docker run \
@@ -3773,7 +3860,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_plugin_versioning-logs
         path: ct-unit_plugin_versioning-logs/*-ct-logs-*.tar.xz
@@ -3797,6 +3884,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_policy_validators
+      id: tests
       run: |
         mkdir ct-unit_policy_validators-logs && chmod 777 ct-unit_policy_validators-logs
         docker run \
@@ -3809,7 +3897,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_policy_validators-logs
         path: ct-unit_policy_validators-logs/*-ct-logs-*.tar.xz
@@ -3833,6 +3921,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_priority_queue
+      id: tests
       run: |
         mkdir ct-unit_priority_queue-logs && chmod 777 ct-unit_priority_queue-logs
         docker run \
@@ -3845,7 +3934,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_priority_queue-logs
         path: ct-unit_priority_queue-logs/*-ct-logs-*.tar.xz
@@ -3869,6 +3958,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_queue_consumers
+      id: tests
       run: |
         mkdir ct-unit_queue_consumers-logs && chmod 777 ct-unit_queue_consumers-logs
         docker run \
@@ -3881,7 +3971,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_queue_consumers-logs
         path: ct-unit_queue_consumers-logs/*-ct-logs-*.tar.xz
@@ -3905,6 +3995,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_stats_and_metrics
+      id: tests
       run: |
         mkdir ct-unit_stats_and_metrics-logs && chmod 777 ct-unit_stats_and_metrics-logs
         docker run \
@@ -3917,7 +4008,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_stats_and_metrics-logs
         path: ct-unit_stats_and_metrics-logs/*-ct-logs-*.tar.xz
@@ -3941,6 +4032,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_supervisor2
+      id: tests
       run: |
         mkdir ct-unit_supervisor2-logs && chmod 777 ct-unit_supervisor2-logs
         docker run \
@@ -3953,7 +4045,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_supervisor2-logs
         path: ct-unit_supervisor2-logs/*-ct-logs-*.tar.xz
@@ -3977,6 +4069,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_vm_memory_monitor
+      id: tests
       run: |
         mkdir ct-unit_vm_memory_monitor-logs && chmod 777 ct-unit_vm_memory_monitor-logs
         docker run \
@@ -3989,7 +4082,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-unit_vm_memory_monitor-logs
         path: ct-unit_vm_memory_monitor-logs/*-ct-logs-*.tar.xz
@@ -4013,6 +4106,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-upgrade_preparation
+      id: tests
       run: |
         mkdir ct-upgrade_preparation-logs && chmod 777 ct-upgrade_preparation-logs
         docker run \
@@ -4025,7 +4119,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-upgrade_preparation-logs
         path: ct-upgrade_preparation-logs/*-ct-logs-*.tar.xz
@@ -4049,6 +4143,7 @@ jobs:
       run: |
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-git-rabbitmq-${{ github.sha }}
     - name: RUN ct-vhost
+      id: tests
       run: |
         mkdir ct-vhost-logs && chmod 777 ct-vhost-logs
         docker run \
@@ -4061,7 +4156,7 @@ jobs:
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
-      if: always()
+      if: failure() && steps.tests.outcome == 'failure'
       with:
         name: rabbit-ct-vhost-logs
         path: ct-vhost-logs/*-ct-logs-*.tar.xz
diff --git a/workflow_sources/test/ct.lib.yml b/workflow_sources/test/ct.lib.yml
index 92d1b0b5c9..d6eee3a722 100644
--- a/workflow_sources/test/ct.lib.yml
+++ b/workflow_sources/test/ct.lib.yml
@@ -1,6 +1,6 @@
 #@ load("@ytt:data", "data")
 #@ load("@ytt:assert", "assert")
-#@ load("util.star", "is_unique", "group_by_one", "to_build_args")
+#@ load("util.star", "is_unique", "to_build_args")
 #@ load("helpers.star", "ci_image_tag", "ci_dep_image", "skip_ci_condition")
 
 #@ def checks_job(dep, erlang_version=None):
@@ -56,8 +56,8 @@ steps:
       cache-to: type=local,dest=/tmp/.buildx-cache
 #@ end
 
-#@ def ct_suites_job(dep, group, erlang_version=None):
-name: #@ dep.name + "-ct-" + group["name"]
+#@ def ct_suites_job(dep, suite_name, erlang_version=None):
+name: #@ dep.name + "-ct-" + suite_name
 needs:
   - prepare
   - #@ dep.name + "-checks"
@@ -76,36 +76,36 @@ steps:
   - name: PULL IMAGE
     run: |
       docker pull (@= ci_dep_image(erlang_version, dep.name) @)
-  #@ for suite in group["suites"]:
-  - name: #@ "RUN ct-" + suite
+  - name: #@ "RUN ct-" + suite_name
+    id: tests
     run: |
-      mkdir ct-(@= suite @)-logs && chmod 777 ct-(@= suite @)-logs
+      mkdir ct-(@= suite_name @)-logs && chmod 777 ct-(@= suite_name @)-logs
       docker run \
         --env project=(@= dep.name @) \
-        --env CT_SUITE=(@= suite @) \
+        --env CT_SUITE=(@= suite_name @) \
         --env GITHUB_RUN_ID=${{ github.run_id }} \
         --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-        --volume ${PWD}/ct-(@= suite @)-logs:/workspace/ct-logs \
+        --volume ${PWD}/ct-(@= suite_name @)-logs:/workspace/ct-logs \
         (@= ci_dep_image(erlang_version, dep.name) @) \
         /workspace/rabbitmq/ci/scripts/ct-suite.sh
   - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
     #! https://github.com/marketplace/actions/upload-artifact
     uses: actions/upload-artifact@v2-preview
-    #! For whatever reason, "if: steps.(@= suite @).outcome == 'failure'" never executes,
-    #! so just run always
-    if: always()
+    if: failure() && steps.tests.outcome == 'failure'
     with:
-      name: (@= dep.name @)-ct-(@= suite @)-logs
-      path: "ct-(@= suite @)-logs/*-ct-logs-*.tar.xz"
+      name: (@= dep.name @)-ct-(@= suite_name @)-logs
+      path: "ct-(@= suite_name @)-logs/*-ct-logs-*.tar.xz"
   #@ if erlang_version == data.values.erlang_versions[0]:
   #@ for version in data.values.secondary_umbrella_gitrefs:
-  #@   logs_dir = 'ct-{}-logs-{}'.format(suite, version)
-  - name: #@ "RUN ct-{} [mixed {}]".format(suite, version)
+  #@   logs_dir = 'ct-{}-logs-{}'.format(suite_name, version)
+  #@   step_id = "tests-{}".format(version.replace(".","_"))
+  - name: #@ "RUN ct-{} [mixed {}]".format(suite_name, version)
+    id: #@ step_id
     run: |
       mkdir (@= logs_dir @) && chmod 777 (@= logs_dir @)
       docker run \
         --env project=(@= dep.name @) \
-        --env CT_SUITE=(@= suite @) \
+        --env CT_SUITE=(@= suite_name @) \
         --env GITHUB_RUN_ID=${{ github.run_id }} \
         --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
         --env SECONDARY_UMBRELLA_VERSION=(@= version @) \
@@ -117,18 +117,17 @@ steps:
     uses: actions/upload-artifact@v2-preview
     #! For whatever reason, "if: steps.(@= suite @).outcome == 'failure'" never executes,
     #! so just run always
-    if: always()
+    if: failure() && steps.(@= step_id @).outcome == 'failure'
     with:
-      name: (@= dep.name @)-ct-(@= suite @)-logs-mixed-(@= version @)
+      name: (@= dep.name @)-ct-(@= suite_name @)-logs-mixed-(@= version @)
       path: "(@= logs_dir @)/*-ct-logs-*.tar.xz"
   #@ end
   #@ end
-  #@ end
 #@ end
 
 #@ def collect_job(dep, erlang_version=None):
 name: #@ dep.name
-needs: #@ [dep.name + "-checks"] + [dep.name + "-ct-" + group["name"] for group in group_by_one(dep.suites)]
+needs: #@ [dep.name + "-checks"] + [dep.name + "-ct-" + suite.name for suite in dep.suites]
 runs-on: ubuntu-18.04
 #! See https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#job-status-check-functions
 #! as to why '(success() || failure())' is needed
diff --git a/workflow_sources/test/dep.star b/workflow_sources/test/dep.star
index 84331c08a8..b52d20c1cc 100644
--- a/workflow_sources/test/dep.star
+++ b/workflow_sources/test/dep.star
@@ -1,4 +1,3 @@
-load("util.star", "group_by_one")
 load("rabbitmq_cli.lib.yml", "rabbitmq_cli_job")
 load("ct.lib.yml", "checks_job", "ct_suites_job", "collect_job")
 load("tests.lib.yml", "tests_job")
@@ -10,8 +9,8 @@ def dep_jobs(dep, erlang_version=None):
       jobs[dep.name] = rabbitmq_cli_job(dep, erlang_version=erlang_version)
     elif getattr(dep, "test_suites_in_parallel", False):
       jobs[dep.name + "-checks"] = checks_job(dep, erlang_version=erlang_version)
-      for group in group_by_one(dep.suites):
-        jobs[dep.name + "-ct-" + group["name"]] = ct_suites_job(dep, group, erlang_version=erlang_version)
+      for suite in dep.suites:
+        jobs[dep.name + "-ct-" + suite.name] = ct_suites_job(dep, suite.name, erlang_version=erlang_version)
       end
       jobs[dep.name] = collect_job(dep, erlang_version=erlang_version)
     else:
diff --git a/workflow_sources/test/util.star b/workflow_sources/test/util.star
index 2c6d348564..f08c9a8e7a 100644
--- a/workflow_sources/test/util.star
+++ b/workflow_sources/test/util.star
@@ -42,17 +42,6 @@ def partition(target, groups, suites):
   return partition(target, groups + [group], rest)
 end
 
-def group_by_time(suites):
-  longest = max([suite.time for suite in suites])
-  groups = partition(longest, [], suites)
-  return [{"name": name(suites), "suites": [suite.name for suite in suites]} for suites in groups]
-end
-
-# Used when we don't actually want multiple ct-suites per job
-def group_by_one(suites):
-  return [{"name": suite.name, "suites": [suite.name]} for suite in suites]
-end
-
 def to_build_args(d):
   return ",".join(['{0}={1}'.format(k,d[k]) for k in d.keys()])
 end