Simplified list of files for cleanup-config.yml (#54)

Co-authored-by: alessfg <[email protected]>

Author: Moskovych

.github/workflows/molecule.yml

@@ -24,14 +24,17 @@ jobs:
           - stable_push
     steps:
       - name: Check out the codebase
+        if: "!(matrix.scenario == 'plus' && github.event.pull_request.head.repo.full_name != github.repository)"
         uses: actions/checkout@v2
 
       - name: Set up Python 3
+        if: "!(matrix.scenario == 'plus' && github.event.pull_request.head.repo.full_name != github.repository)"
         uses: actions/setup-python@v2
         with:
           python-version: 3.x
 
       - name: Install Molecule dependencies
+        if: "!(matrix.scenario == 'plus' && github.event.pull_request.head.repo.full_name != github.repository)"
         run: |
           pip3 install ansible-base==2.10.3
           pip3 install ansible==2.10.3
@@ -41,8 +44,8 @@ jobs:
           pip3 install docker==4.4.0
 
       - name: Run Molecule tests
+        if: "!(matrix.scenario == 'plus' && github.event.pull_request.head.repo.full_name != github.repository)"
         run: molecule test -s ${{ matrix.scenario }}
-        if: contains(${{ matrix.scenario }}, "plus") && !(github.event_name == "pull_request" && github.event.pull_request.head.repo.fork)
         env:
           PY_COLORS: "1"
           ANSIBLE_FORCE_COLOR: "1"

CHANGELOG.md

@@ -4,7 +4,9 @@
 
 ENHANCEMENTS:
 
-The GitHub actions Molecule CI/CD workflow is no longer run on a new release (this is not necessary since it already runs on every push).
+*   The GitHub actions Molecule CI/CD workflow is no longer run on a new release (this is not necessary since it already runs on every push).
+*   The GitHub actions Molecule CI/CD workflow should now correctly avoid running 'Plus' related tests on external PRs.
+*   The `cleanup-config.yml` playbook has been slightly refactored and simplified.
 
 ## 0.3.1 (December 22, 2020)
 

tasks/config/cleanup-config.yml

@@ -12,6 +12,6 @@
   file:
     path: "{{ item }}"
     state: absent
-  loop: "{{ nginx_config_files.results | default('') | map(attribute='files') | sum(start=[]) | map(attribute='path') | list
-        + nginx_config_cleanup_files | default('') | list }}"
+  loop: "{{ nginx_config_files.files | default('') | map(attribute='path') |
+        list + nginx_config_cleanup_files | default('') | list }}"
   notify: (Handler - NGINX Config) Run NGINX