From fc03405df0a632f1492e8d37bf661747cb61c3a6 Mon Sep 17 00:00:00 2001 From: romeroalx Date: Tue, 8 Oct 2024 12:50:00 +0200 Subject: [PATCH 1/4] upgrade docker-py to 7.1.0 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 542765f..f04b6a9 100644 --- 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 From 7f16cb43791f2518040525c6949965f82a6d2b56 Mon Sep 17 00:00:00 2001 From: romeroalx Date: Tue, 8 Oct 2024 12:56:15 +0200 Subject: [PATCH 2/4] use oraclelinux:7 instead of centos:7 --- molecule/dnsdist-16/molecule.yml | 4 ++-- molecule/dnsdist-17/molecule.yml | 4 ++-- molecule/dnsdist-18/molecule.yml | 4 ++-- molecule/dnsdist-master/molecule.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/molecule/dnsdist-16/molecule.yml b/molecule/dnsdist-16/molecule.yml index 5099bc0..4bca3b2 100644 --- 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 index 3371509..72902da 100644 --- 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 index 1d949c3..a3a1840 100644 --- 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 index c0709d3..6bbdcef 100644 --- 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 From d8d43f09fa22ec639e577bddaf723a67f6e86b70 Mon Sep 17 00:00:00 2001 From: romeroalx Date: Tue, 8 Oct 2024 12:56:30 +0200 Subject: [PATCH 3/4] create: mount the cgroups fs as rw as defined in molecules to allow SystemD --- molecule/resources/create.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/resources/create.yml b/molecule/resources/create.yml index 3986fe7..7cb2737 100644 --- 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 }}" From f1742896f279ad524c38cc66e681d0f0e3d6ab25 Mon Sep 17 00:00:00 2001 From: romeroalx Date: Tue, 8 Oct 2024 13:35:27 +0200 Subject: [PATCH 4/4] test_repo_version: allow version and sub-version digits greater than 9 --- molecule/resources/tests/repo-master/test_repo_master.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/resources/tests/repo-master/test_repo_master.py b/molecule/resources/tests/repo-master/test_repo_master.py index 742311b..b926274 100644 --- 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)