Skip to content

Commit ed72fc7

Browse files
authored
Skip GH action *plus* tests only when secrets aren't present (#545)
1 parent bf7f819 commit ed72fc7

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
@@ -32,25 +32,21 @@ jobs:
3232
- upgrade_plus
3333
steps:
3434
- name: Check out the codebase
35-
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
3635
uses: actions/checkout@v3
3736

3837
- name: Set up Python 3
39-
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
4038
uses: actions/setup-python@v4
4139
with:
4240
python-version: 3.x
4341

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

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

5248
- name: Run Molecule tests
53-
if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"
49+
if: ${{ env.NGINX_CRT != 0 && env.NGINX_KEY != 0 }}
5450
run: molecule test -s ${{ matrix.scenario }}
5551
env:
5652
PY_COLORS: 1

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ BUG FIXES:
2525

2626
TESTS:
2727

28+
* 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).
2829
* Add SLES 15 to all Molecule tests.
2930
* Create downgrade and upgrade tests for NGINX Plus.
3031
* Remove Yamllint (Ansible Lint now incorporates Yamllint).

0 commit comments

Comments
 (0)