From a8dba0748adf0f9590aba49e61d1544da533f48e Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 9 Jul 2024 16:23:48 -0600
Subject: [PATCH] Disable Git Master for Phonton 4 & 5 due to setup.py gcc
 failures

---
 .github/workflows/ci.yml                |  4 ++--
 .github/workflows/templates/generate.py |  2 ++
 bootstrap-salt.sh                       | 28 +++++++++++--------------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f246bcd..db37e8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -426,7 +426,7 @@ jobs:
       distro-slug: photon-4
       display-name: Photon OS 4
       timeout: 40
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "git-master", "latest", "default"]'
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
 
 
   photon-5:
@@ -440,7 +440,7 @@ jobs:
       distro-slug: photon-5
       display-name: Photon OS 5
       timeout: 40
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "git-master", "latest", "default"]'
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
 
 
   rockylinux-8:
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index c28c98b..83032fa 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -167,6 +167,8 @@ BLACKLIST_GIT_3007 = [
 
 BLACKLIST_GIT_MASTER = [
     "amazon-2",
+    "photon-4",
+    "photon-5",
 ]
 
 SALT_VERSIONS = [
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 1d1bce5..8feaeeb 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3203,7 +3203,7 @@ install_ubuntu_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -3746,7 +3746,7 @@ install_debian_onedir_deps() {
 ## DGM
 ## DGM     # Let's trigger config_salt()
 ## DGM     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-## DGM         _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+## DGM         _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/" <----- trailing slash ????
 ## DGM         CONFIG_SALT_FUNC="config_salt"
 ## DGM     fi
 ## DGM }
@@ -3791,7 +3791,7 @@ install_debian_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -4250,7 +4250,7 @@ install_fedora_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -4706,7 +4706,7 @@ install_centos_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -5873,7 +5873,7 @@ install_amazon_linux_ami_2_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -6084,7 +6084,7 @@ install_amazon_linux_ami_2023_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -6276,7 +6276,7 @@ install_arch_linux_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -6586,10 +6586,6 @@ install_photon_git_deps() {
         __PACKAGES="${__PACKAGES} git"
     fi
 
-    if ! __check_command_exists gcc; then
-        __PACKAGES="${__PACKAGES} gcc"
-    fi
-
     if [ -n "${__PACKAGES}" ]; then
         # shellcheck disable=SC2086
         __tdnf_install_noinput ${__PACKAGES} || return 1
@@ -6616,13 +6612,13 @@ install_photon_git_deps() {
     if [ "${DISTRO_MAJOR_VERSION}" -gt 3 ]; then
       # Need newer version of setuptools on Photon
       _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
-      echodebug "Running '${_PY_EXE} -m pip --upgrade install ${_setuptools_dep}'"
+      echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_setuptools_dep}'"
       ${_PY_EXE} -m pip install --upgrade "${_setuptools_dep}"
     fi
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -6995,7 +6991,7 @@ install_opensuse_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi
 
@@ -7229,7 +7225,7 @@ install_opensuse_15_git_deps() {
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
-        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
+        _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf"
         CONFIG_SALT_FUNC="config_salt"
     fi