Skip to content

Commit

Permalink
Merge pull request #19 from pwalczysko/fix-build
Browse files Browse the repository at this point in the history
Initial set of changes to fix build
  • Loading branch information
joshmoore authored Jul 28, 2023
2 parents 94173d1 + c3d636e commit 674f2f5
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 42 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,24 @@ jobs:
name: Test
needs:
- list-scenarios
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
# Keep running so we can see if other tests pass
fail-fast: false
matrix:
scenario: ${{fromJson(needs.list-scenarios.outputs.matrix)}}
steps:
- uses: actions/checkout@v2
- uses: ome/action-ome-ansible-molecule@main
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
scenario: ${{ matrix.scenario }}
python-version: '3.8'
- name: Install Ansible & Molecule
run: |
pip install "ansible<8" "ansible-lint<6.13" flake8
pip install "molecule<5" "ansible-compat<4"
pip install molecule-plugins[docker] pytest-testinfra
- name: Run molecule
run: molecule test -s "${{ matrix.scenario }}"

# notifications:
# webhooks: https://galaxy.ansible.com/api/v1/notifications/
8 changes: 4 additions & 4 deletions molecule/centos7/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ dependency:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
lint: |
yamllint .
ansible-lint
flake8
platforms:
- name: omero-all
image: centos/systemd
Expand All @@ -23,5 +25,3 @@ scenario:
name: centos7
verifier:
name: testinfra
lint:
name: flake8
1 change: 0 additions & 1 deletion molecule/ubuntu1804/Dockerfile.j2

This file was deleted.

28 changes: 0 additions & 28 deletions molecule/ubuntu1804/molecule.yml

This file was deleted.

1 change: 0 additions & 1 deletion molecule/ubuntu1804/tests

This file was deleted.

8 changes: 4 additions & 4 deletions molecule/ubuntu2004/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ dependency:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
lint: |
yamllint .
ansible-lint
flake8
platforms:
- name: omero-all
image: jrei/systemd-ubuntu:20.04
Expand All @@ -24,5 +26,3 @@ scenario:
name: ubuntu2004
verifier:
name: testinfra
lint:
name: flake8

0 comments on commit 674f2f5

Please sign in to comment.