From 38c62641cde93e621c3212f8bbfa9182d3231b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20W=C3=BCrsten?= Date: Wed, 1 Feb 2023 11:45:43 +0100 Subject: [PATCH] feat: ubuntu 20 support and testing --- .github/workflows/test.yml | 7 +++++++ meta/main.yml | 1 + molecule/default/molecule.yml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54c393e..9457115 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,6 +9,11 @@ on: jobs: test: runs-on: ubuntu-20.04 + strategy: + matrix: + distro: + - ubuntu20 + - ubuntu22 steps: - name: Checkout repository uses: actions/checkout@v3 @@ -30,3 +35,5 @@ jobs: - name: Test with molecule run: | molecule test + env: + MOLECULE_DISTRO: ${{ matrix.distro }} diff --git a/meta/main.yml b/meta/main.yml index 085712a..7790a57 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,6 +11,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - focal - jammy galaxy_tags: - potos diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 31612c6..b84f612 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -8,7 +8,7 @@ driver: platforms: - name: instance - image: ghcr.io/projectpotos/ubuntu22-ansible-test:latest + image: ghcr.io/projectpotos/${MOLECULE_DISTRO}-ansible-test:latest pre_build_image: true command: /lib/systemd/systemd privileged: true