Skip to content

Commit 7e8817b

Browse files
committed
Skip GH action *plus* tests only when secrets aren't present (#271)
1 parent afff546 commit 7e8817b

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/workflows/molecule.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,21 @@ jobs:
2626
- stable_push
2727
steps:
2828
- name: Check out the codebase
29-
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
3029
uses: actions/checkout@v3
3130

3231
- name: Set up Python 3
33-
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
3432
uses: actions/setup-python@v4
3533
with:
3634
python-version: 3.x
3735

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

42-
- name: Install Ansible base dependencies
43-
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
39+
- name: Install Ansible core dependencies
4440
run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
4541

4642
- name: Run Molecule tests
47-
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
43+
if: ${{ env.NGINX_CRT != 0 && env.NGINX_KEY != 0 }}
4844
run: molecule test -s ${{ matrix.scenario }}
4945
env:
5046
PY_COLORS: 1

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Improve the NGINX main config defaults to bring them closer to the standard NGIN
1515

1616
TESTS:
1717

18+
* Update GitHub actions to only skip \*plus\* scenarios when the NGINX Plus license secrets are not present (it used to only run the NGINX Plus test scenarios during internal PRs).
1819
* Remove Yamllint (Ansible Lint now incorporates Yamllint).
1920
* Skip Ansible Lint line length rule.
2021

0 commit comments

Comments
 (0)