Skip to content

Commit c3d636e

Browse files
committed
Initial set of changes to fix build
1 parent 94173d1 commit c3d636e

File tree

6 files changed

+19
-42
lines changed

6 files changed

+19
-42
lines changed

.github/workflows/molecule.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,24 @@ jobs:
2222
name: Test
2323
needs:
2424
- list-scenarios
25-
runs-on: ubuntu-18.04
25+
runs-on: ubuntu-20.04
2626
strategy:
2727
# Keep running so we can see if other tests pass
2828
fail-fast: false
2929
matrix:
3030
scenario: ${{fromJson(needs.list-scenarios.outputs.matrix)}}
3131
steps:
32-
- uses: actions/checkout@v2
33-
- uses: ome/action-ome-ansible-molecule@main
32+
- uses: actions/checkout@v3
33+
- uses: actions/setup-python@v4
3434
with:
35-
scenario: ${{ matrix.scenario }}
35+
python-version: '3.8'
36+
- name: Install Ansible & Molecule
37+
run: |
38+
pip install "ansible<8" "ansible-lint<6.13" flake8
39+
pip install "molecule<5" "ansible-compat<4"
40+
pip install molecule-plugins[docker] pytest-testinfra
41+
- name: Run molecule
42+
run: molecule test -s "${{ matrix.scenario }}"
3643

3744
# notifications:
3845
# webhooks: https://galaxy.ansible.com/api/v1/notifications/

molecule/centos7/molecule.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ dependency:
55
role-file: requirements.yml
66
driver:
77
name: docker
8-
lint:
9-
name: yamllint
8+
lint: |
9+
yamllint .
10+
ansible-lint
11+
flake8
1012
platforms:
1113
- name: omero-all
1214
image: centos/systemd
@@ -23,5 +25,3 @@ scenario:
2325
name: centos7
2426
verifier:
2527
name: testinfra
26-
lint:
27-
name: flake8

molecule/ubuntu1804/Dockerfile.j2

Lines changed: 0 additions & 1 deletion
This file was deleted.

molecule/ubuntu1804/molecule.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

molecule/ubuntu1804/tests

Lines changed: 0 additions & 1 deletion
This file was deleted.

molecule/ubuntu2004/molecule.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ dependency:
55
role-file: requirements.yml
66
driver:
77
name: docker
8-
lint:
9-
name: yamllint
8+
lint: |
9+
yamllint .
10+
ansible-lint
11+
flake8
1012
platforms:
1113
- name: omero-all
1214
image: jrei/systemd-ubuntu:20.04
@@ -24,5 +26,3 @@ scenario:
2426
name: ubuntu2004
2527
verifier:
2628
name: testinfra
27-
lint:
28-
name: flake8

0 commit comments

Comments
 (0)