Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip: add archlinux test-scenario as platform #164

Merged
merged 8 commits into from
Aug 3, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ jobs:
fail-fast: false
matrix:
scenario:
- archlinux
distros:
- archlinux
- default
releases:
- stable
- beta
Expand All @@ -90,10 +88,11 @@ jobs:
- name: molecule
uses: robertdebock/molecule-action@6.0.1
env:
MOLECULE_DISTRO: "${{ matrix.distros }}"
TEST_RELEASE: "${{ matrix.releases }}"
TEST_VERSION: "${{ matrix.versions }}"
MOLECULE_PLATFORM_NAME: rclone-archlinux
with:
image: carlodepieri/docker-archlinux-ansible
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be able to remove this since it is configured in platform.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct, that was just some random try yesterday

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while we're at it: I think galaxy_release.yml in the workflows could be removed also. Was a try back then, the task is done within molecule.yml. Agree?

scenario: ${{ matrix.scenario }}
release:
if: github.ref == 'refs/heads/main'
Expand Down
18 changes: 0 additions & 18 deletions molecule/archlinux/converge.yml

This file was deleted.

26 changes: 0 additions & 26 deletions molecule/archlinux/molecule.yml

This file was deleted.

28 changes: 0 additions & 28 deletions molecule/archlinux/verify.yml

This file was deleted.

23 changes: 21 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,31 @@ lint: |
yamllint .
ansible-lint
platforms:
- name: "rclone-${image:-debian11}-${tag:-latest}-${TOX_ENVNAME}"
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
- name: "rclone-${image:-debian12}-${tag:-latest}-${TOX_ENVNAME}"
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian12}-ansible:latest"
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
tmpfs:
- /run
- /tmp
cgroupns_mode: host
privileged: true
pre_build_image: true
# - name: "rclone-${image:-archlinux}-${tag:-latest}-${TOX_ENVNAME}"
- name: "rclone-archlinux"
image: "carlodepieri/docker-archlinux-ansible"
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
tmpfs:
- /run
- /tmp
cgroupns_mode: host
privileged: true
pre_build_image: true
ulimits:
- nofile:65535:65535
provisioner:
name: ansible
playbooks:
Expand All @@ -25,3 +42,5 @@ provisioner:
instance:
rclone_release: ${TEST_RELEASE:-stable}
rclone_version: ${TEST_VERSION:-''}
rclone-archlinux:
ansible_user: ansible