Skip to content

Commit

Permalink
Merge pull request #34 from mila-iqia/ci/fix
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
btravouillon authored May 26, 2024
2 parents 0db92d6 + 4dca863 commit 65c4e56
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,4 +40,4 @@ jobs:

- name: Run molecule test
run: |
cd btravouillon.cobbler && tox
cd mila.cobbler && tox
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
tasks:
- name: "Include cobbler"
ansible.builtin.include_role:
name: "btravouillon.cobbler"
name: "mila.cobbler"
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = ansible{6,7}
envlist = ansible{8,9}
skipsdist = true

[testenv]
Expand All @@ -11,9 +11,11 @@ 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
jmespath
molecule
molecule-plugins[docker]
commands =
ansible-galaxy collection install community.docker==3.10.2
molecule test

0 comments on commit 65c4e56

Please sign in to comment.