Add Ubuntu 21.04 to CI (#1560)

* Add Ubuntu 21.04 to CI
2025-04-17 10:10:25 +00:00 · 2021-05-10 18:24:37 +02:00 · 2021-05-10 18:24:37 +02:00 · 600d789cfb
commit 600d789cfb
parent 68417f7fda
3 changed files with 200 additions and 0 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -5608,3 +5608,187 @@ jobs:
        if: always()
        run: |
          bundle exec kitchen destroy latest-ubuntu-2004
+
+
+  py3-stable-3002-ubuntu-2104:
+    name: Ubuntu 21.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-2104 || bundle exec kitchen create py3-stable-3002-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-2104
+
+
+  py3-git-3002-ubuntu-2104:
+    name: Ubuntu 21.04 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-ubuntu-2104 || bundle exec kitchen create py3-git-3002-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-ubuntu-2104
+
+
+  py3-git-master-ubuntu-2104:
+    name: Ubuntu 21.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-2104 || bundle exec kitchen create py3-git-master-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-ubuntu-2104
+
+
+  latest-ubuntu-2104:
+    name: Ubuntu 21.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-2104 || bundle exec kitchen create latest-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-ubuntu-2104
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@ -25,6 +25,7 @@ LINUX_DISTROS = [
    "ubuntu-1604",
    "ubuntu-1804",
    "ubuntu-2004",
+    "ubuntu-2104",
 ]
 OSX = WINDOWS = []

@ -45,6 +46,7 @@ STABLE_DISTROS = [
    "ubuntu-1604",
    "ubuntu-1804",
    "ubuntu-2004",
+    "ubuntu-2104",
 ]

 PY2_BLACKLIST = [
@ -60,6 +62,7 @@ PY2_BLACKLIST = [
    "opensuse-15",
    "opensuse-tumbleweed",
    "ubuntu-2004",
+    "ubuntu-2104",
 ]

 BLACKLIST_3000 = [
@ -69,22 +72,26 @@ BLACKLIST_3000 = [
    "fedora-35",
    "opensuse-tumbleweed",
    "ubuntu-2004",
+    "ubuntu-2104",
 ]

 BLACKLIST_3001 = [
    "debian-11",
+    "ubuntu-2104",
 ]

 BLACKLIST_3001_0 = [
    "debian-11",
    "gentoo",
    "gentoo-systemd",
+    "ubuntu-2104",
 ]

 BLACKLIST_3002_0 = [
    "debian-11",
    "gentoo",
    "gentoo-systemd",
+    "ubuntu-2104",
 ]

 SALT_BRANCHES = [
@ -131,6 +138,7 @@ DISTRO_DISPLAY_NAMES = {
    "ubuntu-1604": "Ubuntu 16.04",
    "ubuntu-1804": "Ubuntu 18.04",
    "ubuntu-2004": "Ubuntu 20.04",
+    "ubuntu-2104": "Ubuntu 21.04",
 }

 TIMEOUT_DEFAULT = 20
--- a/kitchen.yml
+++ b/kitchen.yml
@ -122,6 +122,9 @@ platforms:
  - name: oraclelinux-7
    driver_config:
      run_command: /usr/lib/systemd/systemd
+  - name: ubuntu-21.04
+    driver_config:
+      run_command: /lib/systemd/systemd
  - name: ubuntu-20.04
    driver_config:
      run_command: /lib/systemd/systemd
@ -164,6 +167,7 @@ suites:
      - gentoo
      - gentoo-systemd
      - ubuntu-2004
+      - ubuntu-2104

  - name: py3-git-3000
    provisioner:
@ -173,6 +177,7 @@ suites:
      - debian-11
      - opensuse-tumbleweed
      - ubuntu-2004
+      - ubuntu-2104
  - name: py3-git-3001
    provisioner:
      salt_version: 3001
@ -191,6 +196,7 @@ suites:
      - opensuse-tumbleweed
      - arch
      - ubuntu-2004
+      - ubuntu-2104
  - name: py3-stable-3001-0
    provisioner:
      salt_version: 3001
@ -204,6 +210,7 @@ suites:
      - arch
      - gentoo
      - gentoo-systemd
+      - ubuntu-2104
  - name: py3-stable-3001
    provisioner:
      salt_version: 3001
@ -213,6 +220,7 @@ suites:
      - opensuse-15
      - opensuse-tumbleweed
      - arch
+      - ubuntu-2104
  - name: py3-stable-3002-0
    provisioner:
      salt_version: 3002