mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 01:30:21 +00:00
Use native repositories for Debian 11
Remove best-effort support for Debian Testing Remove Ubuntu 20.10 support because it is end-of-life
This commit is contained in:
parent
22a56aacf4
commit
3f0a3aba2e
4 changed files with 12 additions and 256 deletions
230
.github/workflows/main.yml
vendored
230
.github/workflows/main.yml
vendored
|
@ -2850,236 +2850,6 @@ jobs:
|
|||
bundle exec kitchen destroy latest-debian-10
|
||||
|
||||
|
||||
py3-stable-3002-debian-11:
|
||||
name: Debian 11 v3002 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py3-stable-3002-debian-11
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py3-stable-3002-debian-11
|
||||
|
||||
|
||||
py3-git-3002-debian-11:
|
||||
name: Debian 11 v3002 Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py3-git-3002-debian-11
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py3-git-3002-debian-11
|
||||
|
||||
|
||||
py3-stable-3003-debian-11:
|
||||
name: Debian 11 v3003 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create py3-stable-3003-debian-11 || bundle exec kitchen create py3-stable-3003-debian-11
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py3-stable-3003-debian-11
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py3-stable-3003-debian-11
|
||||
|
||||
|
||||
py3-git-3003-debian-11:
|
||||
name: Debian 11 v3003 Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create py3-git-3003-debian-11 || bundle exec kitchen create py3-git-3003-debian-11
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py3-git-3003-debian-11
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py3-git-3003-debian-11
|
||||
|
||||
|
||||
py3-stable-3003-0-debian-11:
|
||||
name: Debian 11 v3003.0 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create py3-stable-3003-0-debian-11 || bundle exec kitchen create py3-stable-3003-0-debian-11
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py3-stable-3003-0-debian-11
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py3-stable-3003-0-debian-11
|
||||
|
||||
|
||||
py3-stable-3004-debian-11:
|
||||
name: Debian 11 v3004 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
|
|
3
.github/workflows/templates/generate.py
vendored
3
.github/workflows/templates/generate.py
vendored
|
@ -58,6 +58,7 @@ BLACKLIST_3002 = [
|
|||
"almalinux-8",
|
||||
"centos-stream8",
|
||||
"rockylinux-8",
|
||||
"debian-11",
|
||||
]
|
||||
|
||||
BLACKLIST_3002_0 = [
|
||||
|
@ -74,6 +75,7 @@ BLACKLIST_3002_0 = [
|
|||
BLACKLIST_3003 = [
|
||||
"rockylinux-8",
|
||||
"ubuntu-1604",
|
||||
"debian-11",
|
||||
]
|
||||
|
||||
BLACKLIST_3003_0 = [
|
||||
|
@ -82,6 +84,7 @@ BLACKLIST_3003_0 = [
|
|||
"gentoo-systemd",
|
||||
"rockylinux-8",
|
||||
"ubuntu-1604",
|
||||
"debian-11"
|
||||
]
|
||||
|
||||
BLACKLIST_3004 = [
|
||||
|
|
18
README.rst
18
README.rst
|
@ -440,24 +440,12 @@ Debian and derivatives
|
|||
~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
- Cumulus Linux 2/3
|
||||
- Debian GNU/Linux 7/8/9/10
|
||||
- Debian GNU/Linux 9/10/11
|
||||
- Devuan GNU/Linux 1/2
|
||||
- Kali Linux 1.0 (based on Debian 7)
|
||||
- Linux Mint Debian Edition 1 (based on Debian 8)
|
||||
- Raspbian 8 (``armhf`` packages) and 9 (using ``git`` installation mode only)
|
||||
|
||||
Debian Best Effort Support: Testing Release
|
||||
*******************************************
|
||||
|
||||
This script provides best-effort support for the upcoming Debian testing release. Package
|
||||
repositories are not provided on `SaltStack's Debian repository`_ for Debian testing releases.
|
||||
However, the bootstrap script will attempt to install the packages for the current stable
|
||||
version of Debian.
|
||||
|
||||
For example, when installing Salt on Debian 11 (Bullseye), the bootstrap script will setup the
|
||||
repository for Debian 10 (Buster) from `SaltStack's Debian repository`_ and install the
|
||||
Debian 10 packages.
|
||||
|
||||
|
||||
Red Hat family
|
||||
~~~~~~~~~~~~~~
|
||||
|
@ -504,7 +492,7 @@ repositories are not provided on `SaltStack's Ubuntu repository`_ for the non-LT
|
|||
bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu
|
||||
release instead.
|
||||
|
||||
For example, when installing Salt on Ubuntu 20.10, the bootstrap script will setup the repository
|
||||
For example, when installing Salt on Ubuntu 21.10, the bootstrap script will setup the repository
|
||||
for Ubuntu 20.04 from `SaltStack's Ubuntu repository`_ and install the 20.04 packages.
|
||||
|
||||
Non-LTS Ubuntu releases are not supported once the release reaches End-of-Life as defined by
|
||||
|
@ -572,9 +560,11 @@ this offering, while limited, is as follows:
|
|||
- Centos 8
|
||||
- Debian 9
|
||||
- Debian 10
|
||||
- Debian 11
|
||||
- Fedora (only git installations)
|
||||
- Ubuntu 16.04
|
||||
- Ubuntu 18.04
|
||||
- Ubuntu 20.04
|
||||
|
||||
On Fedora, PIP installation must be allowed (-P) due to incompatibility with the shipped Tornado
|
||||
library.
|
||||
|
|
|
@ -1591,11 +1591,13 @@ __check_end_of_life_versions() {
|
|||
# = 17.04, 17.10
|
||||
# = 18.10
|
||||
# = 19.04, 19.10
|
||||
# = 20.10
|
||||
if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \
|
||||
[ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \
|
||||
[ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
{ [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
|
||||
echoerror "End of life distributions are not supported."
|
||||
echoerror "Please consider upgrading to the next stable. See:"
|
||||
echoerror " https://wiki.ubuntu.com/Releases"
|
||||
|
@ -3350,17 +3352,8 @@ install_ubuntu_check_services() {
|
|||
# Debian Install Functions
|
||||
#
|
||||
__install_saltstack_debian_repository() {
|
||||
if [ "$DISTRO_MAJOR_VERSION" -eq 11 ]; then
|
||||
# Packages for Debian 11 at repo.saltproject.io are not yet available
|
||||
# Set up repository for Debian 10 for Debian 11 for now until support
|
||||
# is available at repo.saltproject.io for Debian 11.
|
||||
echowarn "Debian 11 distribution detected, but stable packages requested. Trying packages from Debian 10. You may experience problems."
|
||||
DEBIAN_RELEASE="10"
|
||||
DEBIAN_CODENAME="buster"
|
||||
else
|
||||
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
|
||||
DEBIAN_CODENAME="$DISTRO_CODENAME"
|
||||
fi
|
||||
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
|
||||
DEBIAN_CODENAME="$DISTRO_CODENAME"
|
||||
|
||||
__PY_VERSION_REPO="apt"
|
||||
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue