Skip to content

Commit ccf63bb

Browse files
authored
Update GitHub Actions (#171)
1 parent 2cb31c6 commit ccf63bb

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

.github/workflows/molecule.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ jobs:
2525
- stable_push
2626
steps:
2727
- name: Check out the codebase
28-
if: "!(matrix.scenario == 'plus' && github.event.pull_request.head.repo.full_name != github.repository)"
28+
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
2929
uses: actions/[email protected]
3030

3131
- name: Set up Python 3
32-
if: "!(matrix.scenario == 'plus' && github.event.pull_request.head.repo.full_name != github.repository)"
32+
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
3333
uses: actions/[email protected]
3434
with:
3535
python-version: 3.x
3636

3737
- name: Install Molecule dependencies
38-
if: "!(matrix.scenario == 'plus' && github.event.pull_request.head.repo.full_name != github.repository)"
38+
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
3939
run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt
4040

4141
- name: Install Ansible base dependencies
4242
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
4343
run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
4444

4545
- name: Run Molecule tests
46-
if: "!(matrix.scenario == 'plus' && github.event.pull_request.head.repo.full_name != github.repository)"
46+
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
4747
run: molecule test -s ${{ matrix.scenario }}
4848
env:
4949
PY_COLORS: "1"

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ ENHANCEMENTS:
212212
* Replace Molecule tests using Debian stretch with Debian buster (stretch has reached its EoL), and update list of supported platforms.
213213
* Replace Ansible base with Ansible core. Ansible core will be the "core" Ansible release moving forward from Ansible `2.11`.
214214
* Update GitHub actions to add a workflow dispatch option.
215+
* Update GitHub actions `if` conditionals to use the `contains` function instead of checking for exact names.
216+
* Remove Debian Buster from the `plus` Molecule scenario since it often fails in the GitHub Actions CI/CD pipeline.
215217
* Replace "yes"/"no" boolean values with "true"/"false" to comply with YAML spec `1.2`.
216218
* Ensure the default values for the `nginx.conf` template match the default values found on a fresh NGINX installation.
217219

molecule/plus/molecule.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ platforms:
1717
volumes:
1818
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
1919
command: "/usr/sbin/init"
20-
- name: debian-buster
21-
image: debian:buster-slim
22-
dockerfile: ../common/Dockerfile.j2
23-
privileged: true
24-
volumes:
25-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
26-
command: "/sbin/init"
2720
- name: ubuntu-bionic
2821
image: ubuntu:bionic
2922
dockerfile: ../common/Dockerfile.j2

0 commit comments

Comments
 (0)