From 269104e7470f82a5fa416a2d7f19fee7dab2b19f Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Fri, 31 May 2024 11:57:56 -0700 Subject: [PATCH] fix: test stuff --- .github/workflows/molecule.yml | 26 +++++++++++++------------- handlers/main.yml | 4 ++++ molecule/default/molecule.yml | 9 ++++++--- molecule/default/prepare.yml | 6 ++++++ requirements.yml | 3 +++ 5 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 molecule/default/prepare.yml create mode 100644 requirements.yml diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 642c88b..7b60a90 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -8,12 +8,15 @@ on: pull_request: branches: - master + schedule: + - cron: '5 4 */14 * *' # Twice / month, at 4:05 AM. + jobs: lint: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: "${{ github.repository }}" - name: molecule @@ -26,21 +29,18 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: - - geerlingguy/docker-ubuntu2004-ansible:latest - - geerlingguy/docker-ubuntu1804-ansible:latest - - geerlingguy/docker-ubuntu1604-ansible:latest - - geerlingguy/docker-centos8-ansible:latest - - geerlingguy/docker-centos7-ansible:latest + config: + - image: "ubuntu" + tag: "latest" # latest == noble, as of this writing. + - image: "ubuntu" + tag: "jammy" steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: "${{ github.repository }}" - name: molecule - uses: robertdebock/molecule-action@2.6.3 + uses: robertdebock/molecule-action@6.0.1 with: - image: "${{ matrix.image }}" - options: parallel - env: - MOLECULE_DOCKER_IMAGE: "${{ matrix.image }}" + image: ${{ matrix.config.image }} + tag: ${{ matrix.config.tag }} diff --git a/handlers/main.yml b/handlers/main.yml index 7a78414..3c022f7 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,3 +3,7 @@ service: name: rsyslog state: restarted + +- name: ards systemctl daemon-reexec + ansible.builtin.systemd: + daemon_reexec: true diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index eecdcda..8591954 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -2,12 +2,15 @@ role_name_check: 1 dependency: name: galaxy + options: + role-file: requirements.yml + requirements-file: requirements.yml driver: name: docker platforms: - - name: instance - image: ${MOLECULE_DOCKER_IMAGE:-'geerlingguy/docker-ubuntu2004-ansible:latest'} - command: ${MOLECULE_DOCKER_COMMAND:-""} + - name: "drupal-syslog-${image:-ubuntu}-${tag:-latest}${TOX_ENVNAME}" + image: "${namespace:-robertdebock}/${image:-ubuntu}:${tag:-latest}" + command: /sbin/init volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml new file mode 100644 index 0000000..050c21b --- /dev/null +++ b/molecule/default/prepare.yml @@ -0,0 +1,6 @@ +- name: Bootstrap + hosts: all + become: true + gather_facts: false + roles: + - role: robertdebock.bootstrap diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..11e3224 --- /dev/null +++ b/requirements.yml @@ -0,0 +1,3 @@ +--- +roles: + - name: robertdebock.bootstrap