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

Install Python 3.6 only when building Salt 2019 (stable).

Browse source
This commit is contained in:
Ivo Jánský 2020-09-28 17:01:07 +02:00
parent 821cc2a792
commit 898f3948aa
No known key found for this signature in database
GPG key ID: 4ADCFB992CA57189
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.kitchen.yml
View file

@ -98,14 +98,12 @@ platforms:
image: gentoo/stage3:latest
run_command: /sbin/init
provision_command:
- emerge-webrsync
- rc-update add sshd default
- name: gentoo-systemd
driver_config:
image: gentoo/stage3:systemd
run_command: /lib/systemd/systemd
provision_command:
- emerge-webrsync
- systemctl enable sshd.service
- name: opensuse-15
driver_config:

2
bootstrap-salt.sh
View file

@ -7056,7 +7056,7 @@ __gentoo_pre_dep() {
fi
# Enable python 3.6 if installing pre Neon Salt release
if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
if echo "${STABLE_REV}" | grep -q "2019" ; then
if ! emerge --info | sed 's/.*\(PYTHON_TARGETS="[^"]*"\).*/\1/' | grep -q 'python3_6' ; then
echo "PYTHON_TARGETS=\"\${PYTHON_TARGETS} python3_6\"" >> /etc/portage/make.conf
fi