From 85f268cdcd927abfc53b1281ab74a169195cb357 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 12 Apr 2023 12:10:06 -0400
Subject: [PATCH] disable allowing staging releases from this test branch

---
 .github/workflows/release.yml                | 4 ++--
 .github/workflows/staging.yml                | 4 ++--
 .github/workflows/templates/layout.yml.jinja | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 524d825fcb5..bae0f6fb0db 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -43,9 +43,9 @@ jobs:
       - name: Check Branch
         run: |
           echo "Trying to run the staging workflow from branch ${{ github.ref_name }}"
-          if [ "${{ contains(fromJSON('["master", "3006.x", "hotfix/3006.x/remove-systemd-units-dep"]'), github.ref_name) }}" != "true" ]; then
+          if [ "${{ contains(fromJSON('["master", "3006.x"]'), github.ref_name) }}" != "true" ]; then
               echo "Running the staging workflow from the ${{ github.ref_name }} branch is not allowed"
-              echo "Allowed branches: master, 3006.x, hotfix/3006.x/remove-systemd-units-dep"
+              echo "Allowed branches: master, 3006.x"
               exit 1
           else
               echo "Allowed to release from branch ${{ github.ref_name }}"
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 4f66b090d59..dd1df85c6c3 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -52,9 +52,9 @@ jobs:
       - name: Check Branch
         run: |
           echo "Trying to run the staging workflow from branch ${{ github.ref_name }}"
-          if [ "${{ contains(fromJSON('["master", "3006.x", "hotfix/3006.x/remove-systemd-units-dep"]'), github.ref_name) }}" != "true" ]; then
+          if [ "${{ contains(fromJSON('["master", "3006.x"]'), github.ref_name) }}" != "true" ]; then
               echo "Running the staging workflow from the ${{ github.ref_name }} branch is not allowed"
-              echo "Allowed branches: master, 3006.x, hotfix/3006.x/remove-systemd-units-dep"
+              echo "Allowed branches: master, 3006.x"
               exit 1
           else
               echo "Allowed to release from branch ${{ github.ref_name }}"
diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja
index 10aea6d45a6..5b16c89ce74 100644
--- a/.github/workflows/templates/layout.yml.jinja
+++ b/.github/workflows/templates/layout.yml.jinja
@@ -8,7 +8,7 @@
 <%- set skip_junit_reports_check = skip_junit_reports_check|default("${{ github.event_name == 'pull_request' }}") %>
 <%- set gpg_key_id = "64CBBC8173D76B3F" %>
 <%- set prepare_actual_release = prepare_actual_release | default(False) %>
-<%- set release_branches = ["master", "3006.x", "hotfix/3006.x/remove-systemd-units-dep"] %>
+<%- set release_branches = ["master", "3006.x"] %>
 ---
 <%- block name %>
 name: <{ workflow_name }>