From ad5b23490187f43a0ab398e92d5353455d31c7fc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 9 Apr 2022 15:07:39 +0100 Subject: [PATCH 1/5] feat(fedora-36): add platform Fedora 36 is due for release on 2022-04-19: * https://en.wikipedia.org/wiki/Fedora_Linux_release_history#Release_history * https://fedorapeople.org/groups/schedule/f-36/f-36-key-tasks.html This commit also contains an override for the service files, to adjust the path to the Salt executables from `/usr/bin/` to `/usr/local/bin/`. --- .github/workflows/main.yml | 92 +++++++++++++++++++++++++ .github/workflows/templates/generate.py | 9 +++ bootstrap-salt.sh | 5 ++ kitchen.yml | 3 + 4 files changed, 109 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f1cbc92..0e245ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2209,6 +2209,98 @@ jobs: bundle exec kitchen destroy latest-fedora-35 + py3-git-master-fedora-36: + name: Fedora 36 Master 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-master-fedora-36 || bundle exec kitchen create py3-git-master-fedora-36 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-master-fedora-36 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-master-fedora-36 + + + latest-fedora-36: + name: Fedora 36 Latest packaged release + 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 latest-fedora-36 || bundle exec kitchen create latest-fedora-36 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify latest-fedora-36 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy latest-fedora-36 + + py3-git-master-opensuse-15: name: Opensuse 15 Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 1db2bd6..ee1ad4a 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -16,6 +16,7 @@ LINUX_DISTROS = [ "debian-9", "fedora-34", "fedora-35", + "fedora-36", "gentoo", "gentoo-systemd", "opensuse-15", @@ -41,6 +42,7 @@ STABLE_DISTROS = [ "debian-9", "fedora-34", "fedora-35", + "fedora-36", "gentoo", "gentoo-systemd", "opensuse-15", @@ -60,6 +62,7 @@ BLACKLIST_3002 = [ "debian-11", "fedora-34", "fedora-35", + "fedora-36", "gentoo", "gentoo-systemd", "opensuse-15", @@ -76,6 +79,7 @@ BLACKLIST_GIT_3002 = [ "debian-11", "fedora-34", "fedora-35", + "fedora-36", "gentoo", "gentoo-systemd", "opensuse-15", @@ -90,6 +94,7 @@ BLACKLIST_3003 = [ "debian-11", "fedora-34", "fedora-35", + "fedora-36", "gentoo", "gentoo-systemd", "opensuse-15", @@ -105,6 +110,7 @@ BLACKLIST_GIT_3003 = [ "debian-11", "fedora-34", "fedora-35", + "fedora-36", "gentoo", "gentoo-systemd", "opensuse-15", @@ -119,6 +125,7 @@ BLACKLIST_3004 = [ "arch", "fedora-34", "fedora-35", + "fedora-36", "gentoo", "gentoo-systemd", "opensuse-15", @@ -133,6 +140,7 @@ BLACKLIST_GIT_3004 = [ "debian-11", "fedora-34", "fedora-35", + "fedora-36", "gentoo", "gentoo-systemd", "opensuse-15", @@ -175,6 +183,7 @@ DISTRO_DISPLAY_NAMES = { "debian-9": "Debian 9", "fedora-34": "Fedora 34", "fedora-35": "Fedora 35", + "fedora-36": "Fedora 36", "gentoo": "Gentoo", "gentoo-systemd": "Gentoo (systemd)", "opensuse-15": "Opensuse 15", diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c462e0a..934ad08 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4031,6 +4031,11 @@ install_fedora_git_post() { __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" + # Salt executables are located under `/usr/local/bin/` on Fedora 36+ + if [ "${DISTRO_VERSION}" -ge 36 ]; then + sed -i -e 's:/usr/bin/:/usr/local/bin/:g' /lib/systemd/system/salt-*.service + fi + # Skip salt-api since the service should be opt-in and not necessarily started on boot [ $fname = "api" ] && continue diff --git a/kitchen.yml b/kitchen.yml index bc27d41..515b868 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -65,6 +65,9 @@ platforms: - name: fedora-35 driver: provision_command: *fedora_provision_command + - name: fedora-36 + driver: + provision_command: *fedora_provision_command - name: gentoo driver: image: gentoo/stage3:latest From 396a33632e2c557e1fe88d6c00c610f8084f60e0 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Sat, 23 Apr 2022 10:05:45 +0200 Subject: [PATCH 2/5] Ubuntu 22.04 --- .github/workflows/main.yml | 46 +++++++++++++++++++++++++ .github/workflows/templates/generate.py | 9 +++++ .pre-commit-config.yaml | 2 +- bootstrap-salt.sh | 3 ++ kitchen.yml | 5 +++ 5 files changed, 64 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e245ad..df36350 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4323,3 +4323,49 @@ jobs: if: always() run: | bundle exec kitchen destroy latest-ubuntu-2110 + + + py3-git-master-ubuntu-2204: + name: Ubuntu 22.04 Master 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-master-ubuntu-2204 || bundle exec kitchen create py3-git-master-ubuntu-2204 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-master-ubuntu-2204 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-master-ubuntu-2204 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index ee1ad4a..ebfe2b1 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -28,6 +28,7 @@ LINUX_DISTROS = [ "ubuntu-1804", "ubuntu-2004", "ubuntu-2110", + "ubuntu-2204", ] OSX = WINDOWS = [] @@ -53,6 +54,7 @@ STABLE_DISTROS = [ "ubuntu-1804", "ubuntu-2004", "ubuntu-2110", + "ubuntu-2204", ] BLACKLIST_3002 = [ @@ -68,6 +70,7 @@ BLACKLIST_3002 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", + "ubuntu-2204", ] BLACKLIST_GIT_3002 = [ @@ -87,6 +90,7 @@ BLACKLIST_GIT_3002 = [ "rockylinux-8", "ubuntu-2004", "ubuntu-2110", + "ubuntu-2204", ] BLACKLIST_3003 = [ @@ -101,6 +105,7 @@ BLACKLIST_3003 = [ "opensuse-tumbleweed", "rockylinux-8", "ubuntu-1604", + "ubuntu-2204", ] BLACKLIST_GIT_3003 = [ @@ -119,6 +124,7 @@ BLACKLIST_GIT_3003 = [ "ubuntu-1604", "ubuntu-2004", "ubuntu-2110", + "ubuntu-2204", ] BLACKLIST_3004 = [ @@ -131,6 +137,7 @@ BLACKLIST_3004 = [ "opensuse-15", "opensuse-tumbleweed", "ubuntu-1604", + "ubuntu-2204", ] BLACKLIST_GIT_3004 = [ @@ -148,6 +155,7 @@ BLACKLIST_GIT_3004 = [ "ubuntu-1604", "ubuntu-2004", "ubuntu-2110", + "ubuntu-2204", ] SALT_BRANCHES = [ @@ -195,6 +203,7 @@ DISTRO_DISPLAY_NAMES = { "ubuntu-1804": "Ubuntu 18.04", "ubuntu-2004": "Ubuntu 20.04", "ubuntu-2110": "Ubuntu 21.10", + "ubuntu-2204": "Ubuntu 22.04", } TIMEOUT_DEFAULT = 20 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4bd5336..2cdb73a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: end-of-file-fixer # Makes sure files end in a newline and only a newline. - repo: https://github.com/psf/black - rev: 19.10b0 + rev: 22.3.0 hooks: - id: black diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 934ad08..189b8b9 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1466,6 +1466,9 @@ __ubuntu_codename_translation() { "21") DISTRO_CODENAME="hirsute" ;; + "22") + DISTRO_CODENAME="jammy" + ;; *) DISTRO_CODENAME="trusty" ;; diff --git a/kitchen.yml b/kitchen.yml index 515b868..79035ab 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -100,6 +100,11 @@ platforms: - name: oraclelinux-8 - name: oraclelinux-7 - name: rockylinux-8 + - name: ubuntu-22.04 + driver: + run_command: /lib/systemd/systemd + provision_command: + - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: ubuntu-21.10 driver: run_command: /lib/systemd/systemd From 70c0d737e2727ba8993123cfae4464d21e150cb6 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Sat, 23 Apr 2022 12:57:24 +0200 Subject: [PATCH 3/5] Fix black --- .github/workflows/main.yml | 184 ++++++++++++++++++++++++ .github/workflows/templates/generate.py | 3 - bootstrap-salt.sh | 4 +- 3 files changed, 187 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index df36350..68f08a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4325,6 +4325,144 @@ jobs: bundle exec kitchen destroy latest-ubuntu-2110 + py3-stable-3002-ubuntu-2204: + name: Ubuntu 22.04 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-ubuntu-2204 || bundle exec kitchen create py3-stable-3002-ubuntu-2204 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3002-ubuntu-2204 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3002-ubuntu-2204 + + + py3-stable-3003-ubuntu-2204: + name: Ubuntu 22.04 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-ubuntu-2204 || bundle exec kitchen create py3-stable-3003-ubuntu-2204 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-ubuntu-2204 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-ubuntu-2204 + + + py3-stable-3004-ubuntu-2204: + name: Ubuntu 22.04 v3004 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-3004-ubuntu-2204 || bundle exec kitchen create py3-stable-3004-ubuntu-2204 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3004-ubuntu-2204 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3004-ubuntu-2204 + + py3-git-master-ubuntu-2204: name: Ubuntu 22.04 Master Py3 Git runs-on: ubuntu-latest @@ -4369,3 +4507,49 @@ jobs: if: always() run: | bundle exec kitchen destroy py3-git-master-ubuntu-2204 + + + latest-ubuntu-2204: + name: Ubuntu 22.04 Latest packaged release + 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 latest-ubuntu-2204 || bundle exec kitchen create latest-ubuntu-2204 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify latest-ubuntu-2204 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy latest-ubuntu-2204 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index ebfe2b1..c6ca7da 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -70,7 +70,6 @@ BLACKLIST_3002 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", - "ubuntu-2204", ] BLACKLIST_GIT_3002 = [ @@ -105,7 +104,6 @@ BLACKLIST_3003 = [ "opensuse-tumbleweed", "rockylinux-8", "ubuntu-1604", - "ubuntu-2204", ] BLACKLIST_GIT_3003 = [ @@ -137,7 +135,6 @@ BLACKLIST_3004 = [ "opensuse-15", "opensuse-tumbleweed", "ubuntu-1604", - "ubuntu-2204", ] BLACKLIST_GIT_3004 = [ diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 189b8b9..0dd72ac 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2928,7 +2928,9 @@ __enable_universe_repository() { __install_saltstack_ubuntu_repository() { # Workaround for latest non-LTS Ubuntu if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \ - [ "$DISTRO_MAJOR_VERSION" -eq 21 ]; then + [ "$DISTRO_MAJOR_VERSION" -eq 21 ]; \\ + # REMOVE IT when official packages for 22.04 are available + [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems." UBUNTU_VERSION=20.04 UBUNTU_CODENAME="focal" From 96603a7bbc6ec55958ae81242b54d02478a3c540 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Sat, 23 Apr 2022 13:01:32 +0200 Subject: [PATCH 4/5] f --- bootstrap-salt.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 0dd72ac..b81ee7b 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2928,9 +2928,8 @@ __enable_universe_repository() { __install_saltstack_ubuntu_repository() { # Workaround for latest non-LTS Ubuntu if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \ - [ "$DISTRO_MAJOR_VERSION" -eq 21 ]; \\ - # REMOVE IT when official packages for 22.04 are available - [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then + # remove 22 versions when salt packages for 22.04 are available + [ "$DISTRO_MAJOR_VERSION" -eq 21 ] || [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems." UBUNTU_VERSION=20.04 UBUNTU_CODENAME="focal" From bcf58059d5fcedcdbcff3080df320a599566bd6c Mon Sep 17 00:00:00 2001 From: krionbsd Date: Sat, 23 Apr 2022 13:40:33 +0200 Subject: [PATCH 5/5] f --- .github/workflows/main.yml | 92 ------------------------- .github/workflows/templates/generate.py | 2 + bootstrap-salt.sh | 4 +- 3 files changed, 4 insertions(+), 94 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68f08a7..c3d15af 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4325,98 +4325,6 @@ jobs: bundle exec kitchen destroy latest-ubuntu-2110 - py3-stable-3002-ubuntu-2204: - name: Ubuntu 22.04 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-ubuntu-2204 || bundle exec kitchen create py3-stable-3002-ubuntu-2204 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-ubuntu-2204 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-ubuntu-2204 - - - py3-stable-3003-ubuntu-2204: - name: Ubuntu 22.04 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-ubuntu-2204 || bundle exec kitchen create py3-stable-3003-ubuntu-2204 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3003-ubuntu-2204 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3003-ubuntu-2204 - - py3-stable-3004-ubuntu-2204: name: Ubuntu 22.04 v3004 Py3 Stable runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index c6ca7da..de12cfc 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -70,6 +70,7 @@ BLACKLIST_3002 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", + "ubuntu-2204", ] BLACKLIST_GIT_3002 = [ @@ -104,6 +105,7 @@ BLACKLIST_3003 = [ "opensuse-tumbleweed", "rockylinux-8", "ubuntu-1604", + "ubuntu-2204", ] BLACKLIST_GIT_3003 = [ diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b81ee7b..fe5bb5a 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2928,7 +2928,7 @@ __enable_universe_repository() { __install_saltstack_ubuntu_repository() { # Workaround for latest non-LTS Ubuntu if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \ - # remove 22 versions when salt packages for 22.04 are available + # remove 22 version when salt packages for 22.04 are available [ "$DISTRO_MAJOR_VERSION" -eq 21 ] || [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems." UBUNTU_VERSION=20.04 @@ -3043,7 +3043,7 @@ install_ubuntu_stable_deps() { if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then - if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ]; then + if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ] || [ "$DISTRO_MAJOR_VERSION" -ge 22 ]; then __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1 else __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring &&