From bbf820117d4760e5f5995c46a41f136b51fa4ff2 Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Wed, 18 Oct 2023 13:55:56 +1000
Subject: [PATCH] Fix patch job names and remove failure job testnet
 dependencies

---
 .github/workflows/cd-deploy-nodes-gcp.patch.yml  | 10 ++--------
 .github/workflows/ci-unit-tests-docker.patch.yml |  4 ++--
 .github/workflows/ci-unit-tests-docker.yml       |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cd-deploy-nodes-gcp.patch.yml b/.github/workflows/cd-deploy-nodes-gcp.patch.yml
index 4550a65bae8..457bedc2a3b 100644
--- a/.github/workflows/cd-deploy-nodes-gcp.patch.yml
+++ b/.github/workflows/cd-deploy-nodes-gcp.patch.yml
@@ -27,19 +27,13 @@ jobs:
       - run: 'echo "No build required"'
 
   test-configuration-file:
-    name: Test CD default Docker config file
-    runs-on: ubuntu-latest
-    steps:
-      - run: 'echo "No build required"'
-
-  test-configuration-file-testnet:
-    name: Test CD testnet Docker config file
+    name: Test CD default Docker config file / Test default-conf in Docker
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
 
   test-zebra-conf-path:
-    name: Test CD custom Docker config file
+    name: Test CD custom Docker config file / Test custom-conf in Docker
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
\ No newline at end of file
diff --git a/.github/workflows/ci-unit-tests-docker.patch.yml b/.github/workflows/ci-unit-tests-docker.patch.yml
index 5a849f17ac9..e3e629fb490 100644
--- a/.github/workflows/ci-unit-tests-docker.patch.yml
+++ b/.github/workflows/ci-unit-tests-docker.patch.yml
@@ -70,13 +70,13 @@ jobs:
       - run: 'echo "No build required"'
 
   test-configuration-file:
-    name: Test CI default Docker config file
+    name: Test CI default Docker config file / Test default-conf in Docker
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
 
   test-zebra-conf-path:
-    name: Test CI custom Docker config file
+    name: Test CI custom Docker config file / Test custom-conf in Docker
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/ci-unit-tests-docker.yml b/.github/workflows/ci-unit-tests-docker.yml
index 9fc25c6007a..fcd8e74d41f 100644
--- a/.github/workflows/ci-unit-tests-docker.yml
+++ b/.github/workflows/ci-unit-tests-docker.yml
@@ -251,7 +251,7 @@ jobs:
     #
     # This list is for reliable tests that are run on the `main` branch.
     # Testnet jobs are not in this list, because we expect testnet to fail occasionally.
-    needs: [ test-all, test-all-getblocktemplate-rpcs, test-fake-activation-heights, test-empty-sync, test-lightwalletd-integration, test-configuration-file, test-zebra-conf-path, test-configuration-file-testnet ]
+    needs: [ test-all, test-all-getblocktemplate-rpcs, test-fake-activation-heights, test-empty-sync, test-lightwalletd-integration, test-configuration-file, test-zebra-conf-path ]
     # Only open tickets for failed scheduled jobs, manual workflow runs, or `main` branch merges.
     # (PR statuses are already reported in the PR jobs list, and checked by Mergify.)
     # TODO: if a job times out, we want to create a ticket. Does failure() do that? Or do we need cancelled()?