Merge branch 'main' into main

Author: janit42

Diff for: .github/pull_request_template.md

@@ -0,0 +1,15 @@
+## Summary
+Provide a detailed description of all the changes present in this pull request.
+
+## Additional Context
+Add any additional context about the problem here. 
+- [ ] Root cause and the steps to reproduce. (If applicable)
+- [ ] Thought process behind the implementation.
+
+## Related Issues (if any)
+Mention any related issues or pull requests.
+
+## Checklist
+- [ ] 🟢 Spec tests.
+- [ ] 🟢 Acceptance tests.
+- [ ] Manually verified. (For example `puppet apply`)

Diff for: .github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
-        bundle exec matrix_from_metadata_v2 
+        bundle exec matrix_from_metadata_v2 --exclude-platforms '["Ubuntu-22.04-arm", "RedHat-9-arm"]'
 
   Acceptance:
     name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
@@ -71,10 +71,12 @@ jobs:
         bundle env
 
     - name: "Disable mysqld apparmor profile"	
-      if: matrix.platforms.provider == 'provision::docker'	
-      run: |	
+      if: ${{matrix.platforms.provider == 'docker'}}
+      run: |
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/	
         sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
+        sudo systemctl disable apparmor
+        sudo systemctl stop apparmor
 
     - name: Provision test environment
       run: |
@@ -99,4 +101,3 @@ jobs:
       continue-on-error: true
       run: |
         bundle exec rake 'litmus:tear_down'
-

Diff for: .github/workflows/labeller.yml

@@ -1,22 +1,27 @@
-name: community-labeller
+name: Labeller
 
 on:
   issues:
     types:
       - opened
+      - labeled
+      - unlabeled
   pull_request_target:
     types:
       - opened
+      - labeled
+      - unlabeled
 
 jobs:
   label:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: puppetlabs/community-labeller@v0
+      - uses: puppetlabs/community-labeller@v1.0.1
         name: Label issues or pull requests
         with:
           label_name: community
           label_color: '5319e7'
           org_membership: puppetlabs
+          fail_if_member: 'true'
           token: ${{ secrets.IAC_COMMUNITY_LABELER }}

Diff for: .github/workflows/nightly.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
-        bundle exec matrix_from_metadata_v2 
+        bundle exec matrix_from_metadata_v2 --exclude-platforms '["Ubuntu-22.04-arm", "RedHat-9-arm"]'
 
   Acceptance:
     name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
@@ -70,10 +70,12 @@ jobs:
         bundle env
 
     - name: "Disable mysqld apparmor profile"	
-      if: matrix.platforms.provider == 'provision::docker'	
+      if: ${{matrix.platforms.provider == 'docker'}}
       run: |	
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/	
         sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
+        sudo systemctl disable apparmor
+        sudo systemctl stop apparmor
 
     - name: Provision test environment
       run: |
@@ -98,4 +100,3 @@ jobs:
       continue-on-error: true
       run: |
         bundle exec rake 'litmus:tear_down'
-

Diff for: .gitignore

@@ -16,7 +16,7 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/
+/spec/fixtures/modules/*
 /tmp/
 /vendor/
 /convert_report.txt

Diff for: .pdkignore

@@ -16,7 +16,7 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/
+/spec/fixtures/modules/*
 /tmp/
 /vendor/
 /convert_report.txt
@@ -26,20 +26,17 @@
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
-/appveyor.yml
-/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
+/.github/
 /.gitignore
-/.gitlab-ci.yml
 /.pdkignore
 /.puppet-lint.rc
 /Rakefile
 /rakelib/
 /.rspec
-/.rubocop.yml
-/.travis.yml
+/..yml
 /.yardopts
 /spec/
 /.vscode/