patch 2

Author: LukasAud

.github/workflows/integration_test.yml

@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
-      matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
+      matrix: ${{ fromJson(needs.setup_matrix.outputs.matrix) }}
 
     steps:
 
@@ -96,74 +96,94 @@ jobs:
           puts "master_uri=#{t["uri"]}"
         ' >> $GITHUB_OUTPUT
 
-    # === FIXED STEP: run classifier API via Bash on the master ===
-    - name: Classify PE Master with pe_repo::platform (via classifier API)
+    # 1) Warm up services BEFORE classification (2 quick runs)
+    - name: Warm up PE master (first convergence)
       env:
         BOLT_GEM: "1"
       shell: bash
+      run: |
+        MASTER='${{ steps.pe-master.outputs.master_uri }}'
+        MASTER=${MASTER//\"/}; MASTER=${MASTER//\'/}
+        for i in 1 2; do
+          echo "puppet agent -t (warm-up run $i) on $MASTER"
+          bundle exec bolt command run "/opt/puppetlabs/bin/puppet agent -t || true" \
+            -i spec/fixtures/litmus_inventory.yaml --targets "$MASTER"
+          sleep 10
+        done
+
+    # 2) Classify master with the pe_repo platform using RBAC token
+    - name: Classify PE Master with pe_repo::platform (via RBAC token)
+      env:
+        BOLT_GEM: "1"
+        # Optional: override if your plan uses a different admin password
+        PE_ADMIN_PASSWORD: "Puppetlabs123!"
+      shell: bash
       run: |
         MASTER='${{ steps.pe-master.outputs.master_uri }}'
         MASTER=${MASTER//\"/}; MASTER=${MASTER//\'/}
         if [[ -z "$MASTER" ]]; then echo "Empty master target"; exit 1; fi
 
-        # Map matrix platform (e.g. ubuntu-2204-lts) -> ubuntu-22.04-amd64 -> ubuntu_2204_amd64
+        # Map matrix platform -> PE platform tag -> class suffix
         INPUT="${{ matrix.platform }}"           # ubuntu-2204-lts
         OS="${INPUT%%-*}"                        # ubuntu
         VER="${INPUT#*-}" ; VER="${VER%-lts}"    # 2204
         TAG="${OS}-${VER:0:2}.${VER:2:2}-amd64"  # ubuntu-22.04-amd64
         SUFFIX="${TAG//-/_}" ; SUFFIX="${SUFFIX//./}"   # ubuntu_2204_amd64
         CLASS="pe_repo::platform::${SUFFIX}"
-        echo "Classifying master with: ${CLASS}"
+        echo "Classifying master with: ${CLASS} for tag ${TAG}"
 
-        # Run the remote script with /bin/bash -lc so 'pipefail' and '<<<' work
-        bundle exec bolt command run "CLASS=${CLASS} /bin/bash -lc '
+        bundle exec bolt command run "/bin/bash -lc '
           set -euo pipefail
-          CERT=\$(/opt/puppetlabs/bin/puppet config print hostcert)
-          KEY=\$(/opt/puppetlabs/bin/puppet config print hostprivkey)
-          CACERT=/etc/puppetlabs/puppet/ssl/certs/ca.pem
-          # 1) Find PE Master group id
-          GROUPS=\$(curl -s --cert \"\$CERT\" --key \"\$KEY\" --cacert \"\$CACERT\" https://localhost:4433/classifier-api/v1/groups)
-          ID=\$(/opt/puppetlabs/puppet/bin/ruby -rjson -e \"g=JSON.parse(STDIN.read); pe=g.find{|x| x[\\\"name\\\"]==\\\"PE Master\\\"} or abort(\\\"PE Master group not found\\\"); puts pe[\\\"id\\\"]\" <<< \"\$GROUPS\")
-          echo \"PE Master group id: \$ID\"
-
-          # 2) Merge the class into the group classes and POST
-          CURR=\$(curl -s --cert \"\$CERT\" --key \"\$KEY\" --cacert \"\$CACERT\" https://localhost:4433/classifier-api/v1/groups/\$ID)
-          UPDATED=\$(/opt/puppetlabs/puppet/bin/ruby -rjson -e \"g=JSON.parse(STDIN.read); g[\\\"classes\\\"] ||= {}; g[\\\"classes\\\"][ENV[\\\"CLASS\\\"]] ||= {}; puts({\\\"id\\\"=>g[\\\"id\\\"],\\\"classes\\\"=>g[\\\"classes\\\"]}.to_json)\" <<< \"\$CURR\")
-
-          curl -s -X POST --cert \"\$CERT\" --key \"\$KEY\" --cacert \"\$CACERT\" \
-            -H \"Content-Type: application/json\" \
-            -d \"\$UPDATED\" \
-            https://localhost:4433/classifier-api/v1/groups/\$ID >/dev/null
+          export PATH=/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin:\$PATH
+
+          # Obtain/refresh an RBAC token (retry a few times while services settle)
+          for i in {1..10}; do
+            if /opt/puppetlabs/bin/puppet-access show >/dev/null 2>&1; then
+              break
+            fi
+            /opt/puppetlabs/bin/puppet-access login \
+              --lifetime 30m \
+              -u admin -p \"${PE_ADMIN_PASSWORD}\" && break || sleep 6
+          done
+          TOKEN=\$(/opt/puppetlabs/bin/puppet-access show || true)
+          if [[ -z \"\$TOKEN\" ]]; then
+            echo \"Failed to obtain RBAC token\" >&2
+            exit 1
+          fi
+
+          # Fetch PE Master group id
+          GROUPS=\$(curl -sS -k -H \"X-Authentication: \$TOKEN\" https://localhost:4433/classifier-api/v1/groups)
+          ID=\$(ruby -rjson -e \"g=JSON.parse(STDIN.read); pe=g.find{|x| x['name']=='PE Master'} or abort('PE Master group not found'); puts pe['id']\" <<< \"\$GROUPS\")
+
+          # Merge class into group
+          CURR=\$(curl -sS -k -H \"X-Authentication: \$TOKEN\" https://localhost:4433/classifier-api/v1/groups/\$ID)
+          UPDATED=\$(CLASS=\"${CLASS}\" ruby -rjson -e \"g=JSON.parse(STDIN.read); g['classes']||={}; g['classes'][ENV['CLASS']]||={}; puts({'id'=>g['id'],'classes'=>g['classes']}.to_json)\" <<< \"\$CURR\")
+          curl -sS -k -X POST -H \"X-Authentication: \$TOKEN\" -H 'Content-Type: application/json' \
+               -d \"\$UPDATED\" https://localhost:4433/classifier-api/v1/groups/\$ID >/dev/null
         '" -i spec/fixtures/litmus_inventory.yaml --targets "$MASTER"
 
+    # 3) Converge master again so pe_repo materializes platform content
     - name: Converge PE master (stabilize services & pe_repo)
       env:
         BOLT_GEM: "1"
       shell: bash
       run: |
         MASTER='${{ steps.pe-master.outputs.master_uri }}'
         MASTER=${MASTER//\"/}; MASTER=${MASTER//\'/}
-        if [[ -z "$MASTER" ]]; then echo "Empty master target"; exit 1; fi
-
-        for i in 1 2; do
-          echo "Puppet agent run $i on master..."
-          bundle exec bolt command run "puppet agent -t || true" \
-            -i spec/fixtures/litmus_inventory.yaml \
-            --targets "$MASTER"
-          sleep 10
-        done
+        echo "puppet agent -t (post-classification) on $MASTER"
+        bundle exec bolt command run "/opt/puppetlabs/bin/puppet agent -t || true" \
+          -i spec/fixtures/litmus_inventory.yaml --targets "$MASTER"
 
+        # Verify the agent packages folder exists for your platform
         INPUT="${{ matrix.platform }}"           # ubuntu-2204-lts
         OS="${INPUT%%-*}"                        # ubuntu
         VER="${INPUT#*-}" ; VER="${VER%-lts}"    # 2204
         TAG="${OS}-${VER:0:2}.${VER:2:2}-amd64"  # ubuntu-22.04-amd64
-
         bundle exec bolt command run \
-          "PEV=\$(facter -p pe_server_version 2>/dev/null || echo '2023.8.5'); \
+          "/bin/bash -lc 'PEV=\$(facter -p pe_server_version 2>/dev/null || echo 2023.8.5); \
            test -d /opt/puppetlabs/server/data/packages/public/\$PEV/${TAG} || \
-           (echo 'Missing pe_repo packages for ${TAG}'; ls -ld /opt/puppetlabs/server/data/packages/public/*; exit 1)" \
-          -i spec/fixtures/litmus_inventory.yaml \
-          --targets "$MASTER"
+           (echo Missing pe_repo packages for ${TAG}; ls -ld /opt/puppetlabs/server/data/packages/public/*; exit 1)'" \
+          -i spec/fixtures/litmus_inventory.yaml --targets "$MASTER"
 
     - name: Install Agents
       env: