saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-10 06:41:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable Git Master for Phonton 4 & 5 due to setup.py gcc failures

Browse source
This commit is contained in:
David Murphy 2024-07-09 16:23:48 -06:00 • committed by Daniel Wozniak
parent ca1d8d679f
commit a8dba0748a
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -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:

2
.github/workflows/templates/generate.py vendored
View file

@ -167,6 +167,8 @@ BLACKLIST_GIT_3007 = [
BLACKLIST_GIT_MASTER = [
"amazon-2",
"photon-4",
"photon-5",
]
SALT_VERSIONS = [

28
bootstrap-salt.sh
View file

@ -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