Merge pull request #125 from romeroalx/fix-ci-requests

GH Actions: fix issues with CI
PowerDNS · Nov 27, 2024 · 8a6bb0f · 8a6bb0f
2 parents ca381db + f174289
commit 8a6bb0f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/molecule/dnsdist-16/molecule.yml b/molecule/dnsdist-16/molecule.yml
@@ -10,8 +10,8 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: centos-7
-    image: centos:7
+  - name: oraclelinux-7
+    image: oraclelinux:7
     dockerfile_tpl: centos-systemd
 
   - name: oraclelinux-8

diff --git a/molecule/dnsdist-17/molecule.yml b/molecule/dnsdist-17/molecule.yml
@@ -10,8 +10,8 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: centos-7
-    image: centos:7
+  - name: oraclelinux-7
+    image: oraclelinux:7
     dockerfile_tpl: centos-systemd
 
   - name: oraclelinux-8

diff --git a/molecule/dnsdist-18/molecule.yml b/molecule/dnsdist-18/molecule.yml
@@ -10,8 +10,8 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: centos-7
-    image: centos:7
+  - name: oraclelinux-7
+    image: oraclelinux:7
     dockerfile_tpl: centos-systemd
 
   - name: oraclelinux-8

diff --git a/molecule/dnsdist-master/molecule.yml b/molecule/dnsdist-master/molecule.yml
@@ -10,8 +10,8 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: centos-7
-    image: centos:7
+  - name: oraclelinux-7
+    image: oraclelinux:7
     dockerfile_tpl: centos-systemd
 
   - name: oraclelinux-8

diff --git a/molecule/resources/create.yml b/molecule/resources/create.yml
@@ -62,5 +62,5 @@
         privileged: "yes"
         volumes:
           # Mount the cgroups fs to allow SystemD to run into the containers
-          - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
+          - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
       with_items: "{{ molecule_platform_instances }}"
diff --git a/molecule/resources/tests/repo-master/test_repo_master.py b/molecule/resources/tests/repo-master/test_repo_master.py
@@ -29,4 +29,4 @@ def test_dnsdist_repo(host):
 def test_dnsdist_version(host):
     cmd = host.run('/usr/bin/dnsdist --version')
 
-    assert re.match('dnsdist \d\.\d\.', cmd.stdout)
+    assert re.match('dnsdist \d+\.\d+\.', cmd.stdout)
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -4,4 +4,4 @@ molecule-plugins[docker]==23.4.1
 molecule-plugins[lint]==23.4.1
 molecule==5.1.0
 pytest-testinfra==8.1.0
-docker==6.1.3
+docker==7.1.0