Merge pull request #8 from glyg/glyg

Move to Ubuntu 22.04 and Rcokylinux 9
ome · Nov 1, 2023 · 4ddb27d · 4ddb27d
2 parents d393dc9 + 0089500
commit 4ddb27d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -9,10 +9,10 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 7
+        - 9
     - name: Ubuntu
       versions:
-        - bionic
+        - Jammy
   namespace: ome
   galaxy_tags: []
 

diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -8,15 +8,14 @@ lint: |
     ansible-lint
     flake8
 platforms:
-  # These two containers test that the "reload systemd" handler can be
-  # notified regardless of systemd status
-  - name: omero-common
-    image: centos:7
-  - name: omero-common-systemd
-    image: centos/systemd:latest
-  - name: ubuntu-20.04
-    image: ubuntu:20.04
-    # TODO: Find an Ubuntu Systemd container suitable for testing
+  - name: rockylinux
+    image: rockylinux:9
+  - name: ubuntu-22.04
+    image: ubuntu:22.04
+  - name: ubuntu-systemd-22.04
+    image: eniocarboni/docker-ubuntu-systemd:22.04
+  - name: rockylinux-systemd-22.04
+    image: eniocarboni/docker-rockylinux-systemd:9
 provisioner:
   name: ansible
   lint: