Skip to content

Commit e0f0824

Browse files
committed
fix(bootstrap): use shared pip-based git install on Photon OS, fix Ubuntu 26.04 CI pip breakage
Photon's git installer called `setup.py install` directly, which fails under modern setuptools ("egg-based install has been removed"). Route it through the shared __install_salt_from_repo() helper like every other distro's git installer. Also add ubuntu-2604 to the --break-system-packages allowlist in test-linux.yml, since its Python 3.14 enforces PEP 668 and the CI dependency install step was failing before bootstrap-salt.sh even ran.
1 parent 579eeea commit e0f0824

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

.github/workflows/test-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ jobs:
6464
/usr/bin/docker start ${{ github.run_id }}_salt-test
6565
6666
- name: "Install Python Dependencies with pip breakage in container ${{ inputs.container-slug }}"
67-
if: ${{ ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
67+
if: ${{ ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) || ( inputs.distro-slug == 'ubuntu-2604' ) }}
6868
run: |
6969
docker exec ${{ github.run_id}}_salt-test python3 -m pip install --break-system-packages -r /_w/btstrap/tests/requirements.txt
7070
7171
- name: "Install Python Dependencies without pip breakage in container ${{ inputs.container-slug }}"
72-
if: ${{ ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
72+
if: ${{ ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) && ( inputs.distro-slug != 'ubuntu-2604' ) }}
7373
run: |
7474
docker exec ${{ github.run_id}}_salt-test python3 -m pip install -r /_w/btstrap/tests/requirements.txt
7575

bootstrap-salt.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6722,11 +6722,7 @@ install_vmware_photon_os_git() {
67226722

67236723
install_vmware_photon_os_git_deps
67246724

6725-
if [ -f "${_SALT_GIT_CHECKOUT_DIR}/salt/syspaths.py" ]; then
6726-
${_PYEXE} setup.py --salt-config-dir="$_SALT_ETC_DIR" --salt-cache-dir="${_SALT_CACHE_DIR}" ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1
6727-
else
6728-
${_PYEXE} setup.py ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1
6729-
fi
6725+
__install_salt_from_repo "${_PYEXE}" || return 1
67306726
return 0
67316727
}
67326728

0 commit comments

Comments
 (0)