From ce779b02ab51f35a06c8a42e5e9b320ca44f49da Mon Sep 17 00:00:00 2001 From: krionbsd Date: Fri, 7 Jan 2022 09:52:26 +0100 Subject: [PATCH] Add CI for Ubuntu-21.10 and remove for 21.04 --- .github/workflows/main.yml | 70 ++++++++++++------------- .github/workflows/templates/generate.py | 12 ++--- kitchen.yml | 6 +-- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9749fcf..3a169d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7082,8 +7082,8 @@ jobs: bundle exec kitchen destroy latest-ubuntu-2004 - py3-stable-3002-ubuntu-2104: - name: Ubuntu 21.04 v3002 Py3 Stable + py3-stable-3002-ubuntu-2110: + name: Ubuntu 21.10 v3002 Py3 Stable runs-on: ubuntu-latest timeout-minutes: 20 @@ -7116,20 +7116,20 @@ jobs: - name: Create Test Container run: | - bundle exec kitchen create py3-stable-3002-ubuntu-2104 || bundle exec kitchen create py3-stable-3002-ubuntu-2104 + bundle exec kitchen create py3-stable-3002-ubuntu-2110 || bundle exec kitchen create py3-stable-3002-ubuntu-2110 - name: Test Bootstrap In Test Container run: | - bundle exec kitchen verify py3-stable-3002-ubuntu-2104 + bundle exec kitchen verify py3-stable-3002-ubuntu-2110 - name: Destroy Test Container if: always() run: | - bundle exec kitchen destroy py3-stable-3002-ubuntu-2104 + bundle exec kitchen destroy py3-stable-3002-ubuntu-2110 - py3-git-3002-ubuntu-2104: - name: Ubuntu 21.04 v3002 Py3 Git + py3-git-3002-ubuntu-2110: + name: Ubuntu 21.10 v3002 Py3 Git runs-on: ubuntu-latest timeout-minutes: 20 @@ -7162,20 +7162,20 @@ jobs: - name: Create Test Container run: | - bundle exec kitchen create py3-git-3002-ubuntu-2104 || bundle exec kitchen create py3-git-3002-ubuntu-2104 + bundle exec kitchen create py3-git-3002-ubuntu-2110 || bundle exec kitchen create py3-git-3002-ubuntu-2110 - name: Test Bootstrap In Test Container run: | - bundle exec kitchen verify py3-git-3002-ubuntu-2104 + bundle exec kitchen verify py3-git-3002-ubuntu-2110 - name: Destroy Test Container if: always() run: | - bundle exec kitchen destroy py3-git-3002-ubuntu-2104 + bundle exec kitchen destroy py3-git-3002-ubuntu-2110 - py3-stable-3003-ubuntu-2104: - name: Ubuntu 21.04 v3003 Py3 Stable + py3-stable-3003-ubuntu-2110: + name: Ubuntu 21.10 v3003 Py3 Stable runs-on: ubuntu-latest timeout-minutes: 20 @@ -7208,20 +7208,20 @@ jobs: - name: Create Test Container run: | - bundle exec kitchen create py3-stable-3003-ubuntu-2104 || bundle exec kitchen create py3-stable-3003-ubuntu-2104 + bundle exec kitchen create py3-stable-3003-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-ubuntu-2110 - name: Test Bootstrap In Test Container run: | - bundle exec kitchen verify py3-stable-3003-ubuntu-2104 + bundle exec kitchen verify py3-stable-3003-ubuntu-2110 - name: Destroy Test Container if: always() run: | - bundle exec kitchen destroy py3-stable-3003-ubuntu-2104 + bundle exec kitchen destroy py3-stable-3003-ubuntu-2110 - py3-git-3003-ubuntu-2104: - name: Ubuntu 21.04 v3003 Py3 Git + py3-git-3003-ubuntu-2110: + name: Ubuntu 21.10 v3003 Py3 Git runs-on: ubuntu-latest timeout-minutes: 20 @@ -7254,20 +7254,20 @@ jobs: - name: Create Test Container run: | - bundle exec kitchen create py3-git-3003-ubuntu-2104 || bundle exec kitchen create py3-git-3003-ubuntu-2104 + bundle exec kitchen create py3-git-3003-ubuntu-2110 || bundle exec kitchen create py3-git-3003-ubuntu-2110 - name: Test Bootstrap In Test Container run: | - bundle exec kitchen verify py3-git-3003-ubuntu-2104 + bundle exec kitchen verify py3-git-3003-ubuntu-2110 - name: Destroy Test Container if: always() run: | - bundle exec kitchen destroy py3-git-3003-ubuntu-2104 + bundle exec kitchen destroy py3-git-3003-ubuntu-2110 - py3-stable-3003-0-ubuntu-2104: - name: Ubuntu 21.04 v3003.0 Py3 Stable + py3-stable-3003-0-ubuntu-2110: + name: Ubuntu 21.10 v3003.0 Py3 Stable runs-on: ubuntu-latest timeout-minutes: 20 @@ -7300,20 +7300,20 @@ jobs: - name: Create Test Container run: | - bundle exec kitchen create py3-stable-3003-0-ubuntu-2104 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2104 + bundle exec kitchen create py3-stable-3003-0-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2110 - name: Test Bootstrap In Test Container run: | - bundle exec kitchen verify py3-stable-3003-0-ubuntu-2104 + bundle exec kitchen verify py3-stable-3003-0-ubuntu-2110 - name: Destroy Test Container if: always() run: | - bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2104 + bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2110 - py3-git-master-ubuntu-2104: - name: Ubuntu 21.04 Master Py3 Git + py3-git-master-ubuntu-2110: + name: Ubuntu 21.10 Master Py3 Git runs-on: ubuntu-latest timeout-minutes: 20 @@ -7346,20 +7346,20 @@ jobs: - name: Create Test Container run: | - bundle exec kitchen create py3-git-master-ubuntu-2104 || bundle exec kitchen create py3-git-master-ubuntu-2104 + bundle exec kitchen create py3-git-master-ubuntu-2110 || bundle exec kitchen create py3-git-master-ubuntu-2110 - name: Test Bootstrap In Test Container run: | - bundle exec kitchen verify py3-git-master-ubuntu-2104 + bundle exec kitchen verify py3-git-master-ubuntu-2110 - name: Destroy Test Container if: always() run: | - bundle exec kitchen destroy py3-git-master-ubuntu-2104 + bundle exec kitchen destroy py3-git-master-ubuntu-2110 - latest-ubuntu-2104: - name: Ubuntu 21.04 Latest packaged release + latest-ubuntu-2110: + name: Ubuntu 21.10 Latest packaged release runs-on: ubuntu-latest timeout-minutes: 20 @@ -7392,13 +7392,13 @@ jobs: - name: Create Test Container run: | - bundle exec kitchen create latest-ubuntu-2104 || bundle exec kitchen create latest-ubuntu-2104 + bundle exec kitchen create latest-ubuntu-2110 || bundle exec kitchen create latest-ubuntu-2110 - name: Test Bootstrap In Test Container run: | - bundle exec kitchen verify latest-ubuntu-2104 + bundle exec kitchen verify latest-ubuntu-2110 - name: Destroy Test Container if: always() run: | - bundle exec kitchen destroy latest-ubuntu-2104 + bundle exec kitchen destroy latest-ubuntu-2110 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index e79b276..8602fdc 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -28,7 +28,7 @@ LINUX_DISTROS = [ "ubuntu-1604", "ubuntu-1804", "ubuntu-2004", - "ubuntu-2104", + "ubuntu-2110", ] OSX = WINDOWS = [] @@ -51,7 +51,7 @@ STABLE_DISTROS = [ "ubuntu-1604", "ubuntu-1804", "ubuntu-2004", - "ubuntu-2104", + "ubuntu-2110", ] BLACKLIST_3001 = [ @@ -59,7 +59,7 @@ BLACKLIST_3001 = [ "centos-stream8", "debian-11", "rockylinux-8", - "ubuntu-2104", + "ubuntu-2110", ] BLACKLIST_3001_0 = [ @@ -70,7 +70,7 @@ BLACKLIST_3001_0 = [ "gentoo", "gentoo-systemd", "rockylinux-8", - "ubuntu-2104", + "ubuntu-2110", ] BLACKLIST_3002 = [ @@ -87,7 +87,7 @@ BLACKLIST_3002_0 = [ "gentoo", "gentoo-systemd", "rockylinux-8", - "ubuntu-2104", + "ubuntu-2110", ] BLACKLIST_3003 = [ @@ -152,7 +152,7 @@ DISTRO_DISPLAY_NAMES = { "ubuntu-1604": "Ubuntu 16.04", "ubuntu-1804": "Ubuntu 18.04", "ubuntu-2004": "Ubuntu 20.04", - "ubuntu-2104": "Ubuntu 21.04", + "ubuntu-2110": "Ubuntu 21.10", } TIMEOUT_DEFAULT = 20 diff --git a/kitchen.yml b/kitchen.yml index 7a5750e..3d614ec 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -103,7 +103,7 @@ platforms: - name: rockylinux-8 driver: image: rockylinux/rockylinux - - name: ubuntu-21.04 + - name: ubuntu-21.10 driver: run_command: /lib/systemd/systemd - name: ubuntu-20.04 @@ -141,7 +141,7 @@ suites: - arch - gentoo - gentoo-systemd - - ubuntu-2104 + - ubuntu-2110 - freebsd-130 - freebsd-123 - openbsd-6 @@ -154,7 +154,7 @@ suites: - opensuse-15 - opensuse-tumbleweed - arch - - ubuntu-2104 + - ubuntu-2110 - freebsd-130 - freebsd-123 - openbsd-6