some fixes to ensure git install works on Photon, in particular Photo…

…n 4.
saltstack · Apr 24, 2023 · ca1142d · ca1142d
1 parent 2d40944
commit ca1142d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -515,7 +515,7 @@ jobs:
       distro-slug: photon-4
       display-name: Photon OS 4
       timeout: 20
-      instances: '["stable-3006", "onedir-3006", "latest"]'
+      instances: '["stable-3006", "onedir-3006", "git-master", "latest"]'
 
 
   rockylinux-8:

diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
@@ -255,9 +255,7 @@
     "ubuntu-2204",
 ]
 
-BLACKLIST_GIT_MASTER = [
-    "photon-4",
-]
+BLACKLIST_GIT_MASTER = []
 
 SALT_VERSIONS = [
     "3003",

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -2687,7 +2687,7 @@ __activate_virtualenv() {
 #          NAME:  __install_pip_pkgs
 #   DESCRIPTION:  Return 0 or 1 if successfully able to install pip packages. Can provide a different python version to
 #                 install pip packages with. If $py_ver is not specified it will use the default python version.
-#    PARAMETERS:  pkgs, py_ver
+#    PARAMETERS:  pkgs, py_ver, upgrade
 #----------------------------------------------------------------------------------------------------------------------
 
 __install_pip_pkgs() {
@@ -6992,13 +6992,15 @@ install_photon_git_deps() {
             done
     else
         __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc"
-        if [ "${DISTRO_VERSION}" -ge 35 ]; then
-            __PACKAGES="${__PACKAGES} gcc-c++"
-        fi
         # shellcheck disable=SC2086
         __tdnf_install_noinput ${__PACKAGES} || return 1
     fi
 
+    # Need newer version of setuptools on Photon
+    _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
+    echodebug "Running '${_PY_EXE} -m pip --upgrade install ${_setuptools_dep}'"
+    ${_PY_EXE} -m pip install --upgrade "${_setuptools_dep}"
+
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
         _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"