Merge pull request #11 from Helmholtz-UFZ/add-focal-support

Add Ubuntu 20.4 support
hifis-net · Aug 27, 2020 · ae21a5d · ae21a5d
2 parents 8097770 + 96ed13b
commit ae21a5d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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