Fix dockers for molecule

OpenConext · Jan 21, 2025 · eaea394 · eaea394
1 parent c11f6d4
commit eaea394
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
@@ -3,12 +3,12 @@ on:
   workflow_dispatch:
     inputs:
       package_name:
-        description: 'The name of the package to delete'     
+        description: 'The name of the package to delete'
         required: true
 
 jobs:
   remove-package-versions:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: purge packages
         uses: dylanratcliffe/delete-untagged-containers@main

diff --git a/.github/workflows/molecule-mongo.yml b/.github/workflows/molecule-mongo.yml
@@ -15,17 +15,19 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+      - name: "Set up Python 3.12"
+        uses: "actions/setup-python@v5"
         with:
-          python-version: 3.8
+          python-version: "3.12"
 
       - name: Installing dependencies
-        run: pip install jinja2 ansible molecule molecule-docker pytest-testinfra pytest setuptools
+        run: |
+          pip install jinja2 ansible molecule molecule-docker pytest-testinfra pytest setuptools
 
       - name: Run role tests
-        run: molecule test -s mongo
+        run: |
+          molecule test -s mongo
diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
@@ -21,13 +21,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v5
+      - name: "Set up Python 3.12"
+        uses: "actions/setup-python@v5"
         with:
-          python-version: 3.8
+          python-version: "3.12"
 
       - name: Installing dependencies
-        run: pip install jinja2 ansible
+        run: |
+          pip install jinja2 ansible
 
       - name: Run syntax check
-        run: ./scripts/syntax-check
+        run: |
+          ./scripts/syntax-check
diff --git a/molecule/galera/molecule.yml b/molecule/galera/molecule.yml
@@ -12,8 +12,10 @@ platforms:
     privileged: True
     networks:
       - name: mariadb
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    tmpfs:
+      - "/tmp"
+      - "/run"
+      - "/sys/fs/cgroup"
     groups:
       - storage
       - dbcluster

diff --git a/molecule/loadbalancer/molecule.yml b/molecule/loadbalancer/molecule.yml
@@ -10,13 +10,15 @@ platforms:
     dockerfile: ../Dockerfile-Rocky9.j2
     command: /usr/sbin/init
     privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    tmpfs:
+      - "/tmp"
+      - "/run"
+      - "/sys/fs/cgroup"
     groups:
       - "loadbalancer-vm"
-      - loadbalancer_ha
-      - selfsigned_certs
-      - loadbalancer
+      - "loadbalancer_ha"
+      - "selfsigned_certs"
+      - "loadbalancer"
 
 provisioner:
   name: ansible

diff --git a/molecule/mongo/molecule.yml b/molecule/mongo/molecule.yml
@@ -10,8 +10,10 @@ platforms:
     image: rockylinux:9
     command: /usr/sbin/init
     privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    tmpfs:
+      - "/tmp"
+      - "/run"
+      - "/sys/fs/cgroup"
     groups:
       - mongo_servers