Merge pull request #217 from coreymbe/PIE-1595-token_variable

(PIE-1595) Token by Source Type
puppetlabs · Oct 29, 2024 · 58fd07b · 58fd07b
2 parents a0de0e5 + d563470
commit 58fd07b
Show file tree

Hide file tree

Showing 15 changed files with 336 additions and 159 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
       id: get-matrix
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-          bundle exec matrix_from_metadata_v2
+          bundle exec matrix_from_metadata_v3
 
   Spec:
     name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"

diff --git a/.github/workflows/latest_testing.yml b/.github/workflows/latest_testing.yml
@@ -7,7 +7,7 @@ jobs:
     name: "Setup Test Matrix"
     runs-on: ubuntu-20.04
     outputs:
-      matrix: ${{ steps.build-matrix.outputs.matrix }}
+      matrix: ${{ steps.set-matrix.outputs.acc_matrix }}
 
     steps:
     - name: Checkout Source
@@ -31,30 +31,34 @@ jobs:
       id: curl_forge
       run: |
         echo "forge_response=$(curl https://forge.puppet.com/private/versions/pe)" >> $GITHUB_OUTPUT
-    - name: Set latest release
+    - name: Set PE latest release
       id: latest_release
       run: |
-        out=$(jq -c '[.[] | select(.lts == false)][0].latest | {"collection": [.]}' <<<'${{ steps.curl_forge.outputs.forge_response }}')
+        out=$(jq -c '[.[] | select(.lts == false)][0].latest | {"pe_version": [.]}' <<<'${{ steps.curl_forge.outputs.forge_response }}')
         echo "latest=$out" >> $GITHUB_OUTPUT
-    - name: Setup Spec Test Matrix
-      id: set-matrix
+    - name: Build Test Matrix
+      id: build-matrix
       run: |
-        echo "matrix={\"platforms\":[\"centos-7\",\"rhel-8\",\"rhel-9\",\"ubuntu-2004-lts\"]}" >> $GITHUB_OUTPUT
+        bundle exec matrix_from_metadata_v3 \
+        --provision-exclude docker \
+        --arch-exclude arm \
+        --platform-exclude debian \
+        --platform-exclude sles \
+        --platform-exclude ubuntu
     - name: Setup Acceptance Test Matrix
-      id: build-matrix
+      id: set-matrix
       run: |
-        out=$(echo '${{ steps.set-matrix.outputs.matrix }}' | jq -c --argjson latest '${{ steps.latest_release.outputs.latest }}' '.collection += $latest.collection') 
-        echo "matrix=$out" >> $GITHUB_OUTPUT
+        out=$(echo '${{ steps.build-matrix.outputs.matrix }}' | jq -c --argjson latest '${{ steps.latest_release.outputs.latest }}' '.collection = $latest.pe_version') 
+        echo "acc_matrix=$out" >> $GITHUB_OUTPUT
   Integration:
-    name: "${{matrix.platforms}}, ${{matrix.collection}}"
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
     needs:
       - setup_matrix
-    if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
 
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
+      matrix: ${{ fromJson(needs.setup_matrix.outputs.matrix) }}
 
     steps:
     - name: Checkout Source
@@ -78,7 +82,7 @@ jobs:
         echo ::endgroup::
     - name: Provision test environment
       run: |
-        bundle exec bolt --modulepath spec/fixtures/modules plan run splunk_hec::acceptance::provision_machines using='provision_service' image='${{ matrix.platforms }}'
+        bundle exec bolt --modulepath spec/fixtures/modules plan run splunk_hec::acceptance::provision_machines using='provision_service' image='${{ matrix.platforms.image }}'
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo

diff --git a/.github/workflows/lts_testing.yml b/.github/workflows/lts_testing.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Setup Spec Test Matrix
       id: set-matrix
       run: |
-        echo "matrix={\"platforms\":[\"centos-7\",\"rhel-8\",\"rhel-9\",\"ubuntu-2004-lts\"]}" >> $GITHUB_OUTPUT
+        echo "matrix={\"platforms\":[\"rhel-7\",\"rhel-8\",\"rhel-9\"]}" >> $GITHUB_OUTPUT
     - name: Setup Acceptance Test Matrix
       id: build-matrix
       run: |

diff --git a/.github/workflows/nightly_testing.yml b/.github/workflows/nightly_testing.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Get Test Matrix
       id: get-matrix
       run: |
-        bundle exec matrix_from_metadata_v2
+        bundle exec matrix_from_metadata_v3
     - name: Set nightly releases
       id: nightly_release
       run: |
@@ -39,7 +39,7 @@ jobs:
     - name: Setup Spec Test Matrix
       id: set-matrix
       run: |
-        echo "matrix={\"platforms\":[\"centos-7\",\"rhel-8\",\"rhel-9\",\"ubuntu-2004-lts\"]}" >> $GITHUB_OUTPUT
+        echo "matrix={\"platforms\":[\"rhel-8\",\"rhel-9\",\"ubuntu-2204-lts\"]}" >> $GITHUB_OUTPUT
     - name: Setup Acceptance Test Matrix
       id: build-matrix
       run: |

diff --git a/.gitignore b/.gitignore
@@ -16,13 +16,20 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/
+/spec/fixtures/modules/*
 /tmp/
 /vendor/
+/.vendor/
 /convert_report.txt
 /update_report.txt
 .DS_Store
 .project
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
+.resource_types
+.modules
+.task_cache.json
+.plan_cache.json
+.rerun.json
+bolt-debug.log
diff --git a/.pdkignore b/.pdkignore
@@ -16,29 +16,34 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/
+/spec/fixtures/modules/*
 /tmp/
 /vendor/
+/.vendor/
 /convert_report.txt
 /update_report.txt
 .DS_Store
 .project
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
-/appveyor.yml
-/.editorconfig
+.resource_types
+.modules
+.task_cache.json
+.plan_cache.json
+.rerun.json
+bolt-debug.log
 /.fixtures.yml
 /Gemfile
 /.gitattributes
+/.github/
 /.gitignore
-/.gitlab-ci.yml
 /.pdkignore
 /.puppet-lint.rc
 /Rakefile
 /rakelib/
 /.rspec
-/.rubocop.yml
+/..yml
 /.yardopts
 /spec/
 /.vscode/