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

Fix tests not running on external PRs #297

Merged
merged 1 commit into from
Jan 10, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
11 changes: 8 additions & 3 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
molecule:
name: Molecule
runs-on: ubuntu-20.04
env:
NGINX_CRT: ${{ secrets.NGINX_CRT }}
NGINX_KEY: ${{ secrets.NGINX_KEY }}
strategy:
fail-fast: false
matrix:
Expand All @@ -26,24 +29,26 @@ jobs:
- stable_push
steps:
- name: Check out the codebase
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
uses: actions/checkout@v3

- name: Set up Python 3
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
uses: actions/setup-python@v4
with:
python-version: 3.x

- name: Install Molecule dependencies
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt

- name: Install Ansible core dependencies
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml

- name: Run Molecule tests
if: ${{ env.NGINX_CRT != 0 && env.NGINX_KEY != 0 }}
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
run: molecule test -s ${{ matrix.scenario }}
env:
PY_COLORS: 1
ANSIBLE_FORCE_COLOR: 1
NGINX_CRT: ${{ secrets.NGINX_CRT }}
NGINX_KEY: ${{ secrets.NGINX_KEY }}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 0.5.3 (Unreleased)

BUG FIXES:

GitHub actions should now correctly skip \*plus\* scenarios only when the NGINX Plus license secrets are not present.

## 0.5.2 (October 17, 2022)

ENHANCEMENTS:
Expand Down