From db9cd3305f1f3bc115d56ed57b47f40e2045e4ca Mon Sep 17 00:00:00 2001 From: Bruno Travouillon Date: Sat, 25 May 2024 18:58:20 -0400 Subject: [PATCH 1/5] ci: Remove trailing space reported by ansible-lint --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5d8ecee..dfd1297 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -88,7 +88,7 @@ cobbler_systems: [] # cobbler_settings, otherwise Cobbler will not configure the services. cobbler_dnsmasq_module: false -# cobbler_dnsmasq_options, a 'BlockInFile' inserted 'As is' in /etc/cobbler/dnsmasq.template +# cobbler_dnsmasq_options, a 'BlockInFile' inserted 'As is' in /etc/cobbler/dnsmasq.template # cobbler_dnsmasq_options: | # interface=eth0 # dhcp-range=192.168.0.101,192.168.0.150 From 6bccfad70b337f034d09ec53da04f0e1bc3041e4 Mon Sep 17 00:00:00 2001 From: Bruno Travouillon Date: Sat, 25 May 2024 19:04:36 -0400 Subject: [PATCH 2/5] ci: Test latest Ansible 8 and 9 --- meta/main.yml | 2 +- tox.ini | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 645afd0..018e5de 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: MIT - min_ansible_version: "2.12" + min_ansible_version: "2.15" # If this a Container Enabled role, provide the minimum Ansible Container version. # min_ansible_container_version: diff --git a/tox.ini b/tox.ini index 3d1b631..8fb2aa3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = ansible{6,7} +envlist = ansible{8,9} skipsdist = true [testenv] @@ -11,8 +11,8 @@ passenv = PY_COLORS ANSIBLE_FORCE_COLOR deps = - ansible6: ansible>=6.0,<7.0 - ansible7: ansible>=7.0,<8.0 + ansible8: ansible>=8.0,<9.0 + ansible9: ansible>=9.0,<10.0 molecule molecule-plugins[docker] commands = From 769dd3eda18e4f5c2c97628c4a33b16a9b540f8f Mon Sep 17 00:00:00 2001 From: Bruno Travouillon Date: Sat, 25 May 2024 20:50:58 -0400 Subject: [PATCH 3/5] ci: Update community.docker to 3.10.2 This is a temporary workaround for molecule+docker [1]. [1] https://github.com/ansible-community/molecule-plugins/issues/256#issuecomment-2125433547 --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 8fb2aa3..ae06eec 100644 --- a/tox.ini +++ b/tox.ini @@ -16,4 +16,5 @@ deps = molecule molecule-plugins[docker] commands = + ansible-galaxy collection install community.docker==3.10.2 molecule test From 9bfb501f310595216b10e76664ed7f00546e587d Mon Sep 17 00:00:00 2001 From: Bruno Travouillon Date: Sat, 25 May 2024 21:25:06 -0400 Subject: [PATCH 4/5] ci: Use mila namespace with molecule The role moved from namespace btravouillon to mila a while ago in aaeee06a. --- .github/workflows/molecule.yml | 4 ++-- molecule/default/converge.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index f4cc711..6b5ae81 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -30,7 +30,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: - path: btravouillon.cobbler + path: mila.cobbler - name: Setup python environment uses: actions/setup-python@v3 @@ -40,4 +40,4 @@ jobs: - name: Run molecule test run: | - cd btravouillon.cobbler && tox + cd mila.cobbler && tox diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 077d40d..ad53bf4 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -8,4 +8,4 @@ tasks: - name: "Include cobbler" ansible.builtin.include_role: - name: "btravouillon.cobbler" + name: "mila.cobbler" From 4dca863ca6c7b029d20a1f680e2adc78afb055ec Mon Sep 17 00:00:00 2001 From: Bruno Travouillon Date: Sat, 25 May 2024 21:38:23 -0400 Subject: [PATCH 5/5] ci: Install jmespath dependency for json_query --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index ae06eec..9f62329 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ passenv = deps = ansible8: ansible>=8.0,<9.0 ansible9: ansible>=9.0,<10.0 + jmespath molecule molecule-plugins[docker] commands =