From 96ed13b366079af22a96f2bc0c9f02b925c14bc1 Mon Sep 17 00:00:00 2001 From: Norman Ziegner Date: Thu, 27 Aug 2020 10:21:26 +0200 Subject: [PATCH] Run molecule test on different images Signed-off-by: Norman Ziegner --- .github/workflows/continuous-integration.yml | 5 +++++ meta/main.yml | 2 ++ molecule/default/molecule.yml | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6c0d2c0..fa84d77 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -20,6 +20,9 @@ jobs: test: needs: validate runs-on: ubuntu-latest + strategy: + matrix: + images: ['jrei/systemd-ubuntu:18.04', 'jrei/systemd-ubuntu:20.04'] steps: - name: Check out repository uses: actions/checkout@v2 @@ -28,3 +31,5 @@ jobs: - name: Molecule test uses: robertdebock/molecule-action@2.6.1 + env: + MOLECULE_IMAGE: "${{ matrix.images }}" diff --git a/meta/main.yml b/meta/main.yml index 97f1ff0..bd81b36 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,12 +4,14 @@ galaxy_info: author: HIFIS Software Services company: Helmholtz Association of German Research Centres license: MIT + issue_tracker_url: https://github.com/Helmholtz-UFZ/ansible-role-zammad/issues min_ansible_version: 2.9 platforms: - name: Ubuntu versions: - bionic + - focal galaxy_tags: - zammad diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 7478133..ee863e4 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -7,7 +7,7 @@ driver: name: docker platforms: - name: instance - image: jrei/systemd-ubuntu:18.04 + image: ${MOLECULE_IMAGE:-jrei/systemd-ubuntu:20.04} pre_build_image: true privileged: true override_command: false