From ad5b23490187f43a0ab398e92d5353455d31c7fc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 9 Apr 2022 15:07:39 +0100 Subject: [PATCH] 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