Merge branch 'polkadot-stable2506' into pallet_glutton

Author: Klapeyron

.github/actions/artifacts/build-pc-artifacts/action.yml

@@ -101,5 +101,5 @@ runs:
     - name: Upload partner-chains-demo-node artifact
       uses: actions/upload-artifact@v4
       with:
-        name: partner-chains-demo-node-${{ inputs.os }}-artifact
-        path: ${{ env.PARTNER_CHAINS_NODE }}
+        name: partner-chains-node-${{ inputs.os }}-artifact
+        path: ${{ env.PARTNER_CHAINS_NODE }}

.github/actions/artifacts/generate-chain-specs/action.yml

@@ -23,8 +23,6 @@ runs:
         ./partner-chains-node-${{ inputs.tag }}-x86_64-linux build-spec --chain staging --disable-default-bootnode > ci_preview_chain_spec.json
         source ./dev/envs/staging-preview/.envrc
         ./partner-chains-node-${{ inputs.tag }}-x86_64-linux build-spec --chain staging --disable-default-bootnode > staging_preview_chain_spec.json
-        source ./dev/envs/staging-preprod/.envrc
-        ./partner-chains-node-${{ inputs.tag }}-x86_64-linux build-spec --chain staging --disable-default-bootnode > staging_preprod_chain_spec.json
     - name: Upload Chain Specs
       uses: actions/upload-artifact@v4
       with:
@@ -33,4 +31,3 @@ runs:
           devnet_chain_spec.json
           ci_preview_chain_spec.json
           staging_preview_chain_spec.json
-          staging_preprod_chain_spec.json

.github/actions/deploy/deploy-staging-preprod/action.yml

@@ -1,4 +1,4 @@
-name: "Deploy staging-preprod"
+name: "Deploy staging-preprod - THERE ARE NO VALID CHAIN SPECS FOR PREPROD"
 description: "Deploys the staging-preprod environment with chain-spec and image override using Kubernetes and Helm."
 inputs:
   image:

.github/actions/deploy/upload-chain-specs/action.yml

@@ -1,5 +1,5 @@
 name: Upload Chain Spec Artifacts to Kubernetes PVC
-description: Uploads chain‑spec artifacts to PVCs for devnet, staging‑preview and staging‑preprod.
+description: Uploads chain‑spec artifacts to PVCs for devnet and staging‑preview.
 
 inputs:
   sha:
@@ -53,7 +53,3 @@ runs:
         if [ -f ./staging_preview_chain_spec.json ]; then
           kubectl cp ./staging_preview_chain_spec.json staging-preview/pvc-uploader-staging-preview:/mnt/chain-spec/staging-preview-chain-spec-${{ inputs.sha }}.json
         fi
-
-        if [ -f ./staging_preprod_chain_spec.json ]; then
-          kubectl cp ./staging_preprod_chain_spec.json staging-preprod/pvc-uploader-staging-preprod:/mnt/chain-spec/staging-preprod-chain-spec-${{ inputs.sha }}.json
-        fi

.github/actions/tests/local-environment-tests/action.yml

@@ -10,8 +10,8 @@ inputs:
   tag:
     description: "PC Artifact Tag"
     required: true
-  tests:
-    description: "Test set to run (premerge or postmerge)"
+  markers:
+    description: 'Run tests by markers (-m). Available markers: smoke, rpc, reserve, governed_map, delegator_rewards, ariadne, wizards or full'
     required: true
 
 outputs: {}
@@ -23,39 +23,47 @@ runs:
       uses: actions/checkout@v4
       with:
         ref: ${{ inputs.sha }}
+
     - name: Acquire AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.AWS_ROLE_ARN_SECRET }}
         aws-region: ${{ env.AWS_REGION }}
+
     - name: Login to ECR
       uses: docker/login-action@v3
       with:
         registry: ${{ env.ECR_REGISTRY_SECRET }}
+
     - name: Deploy local environment
       run: |
         mkdir -p dev/local-environment/configurations/tests/e2e-tests
         cp -r e2e-tests/* dev/local-environment/configurations/tests/e2e-tests
         cd dev/local-environment
-        bash setup.sh --non-interactive --postgres-password azMpOp4mTqhlKDmgCVQr --node-image ${{ inputs.image }} --tests
+        if [ "${{ inputs.markers }}" = "wizards" ]; then
+          bash setup.sh --non-interactive --postgres-password azMpOp4mTqhlKDmgCVQr --node-image ${{ inputs.image }} --tests -d 5
+        else
+          bash setup.sh --non-interactive --postgres-password azMpOp4mTqhlKDmgCVQr --node-image ${{ inputs.image }} --tests
+        fi
         docker compose up -d
         cd ../../
       shell: bash
+
     - name: Wait for partner-chains-node-1 to start
       id: wait-pc-node
       continue-on-error: true
       run: |
         # Wait for the Cardano node to be ready
         while ! docker exec cardano-node-1 [ -e /shared/cardano.ready ]; do sleep 1; done
-        echo "Cardano network is ready! Waiting for Partner Chain first node to start..."
+        echo "Cardano network is ready! Waiting for partner-chains-node-1 to start..."
         INIT_TIMESTAMP=$(docker exec cardano-node-1 cat /shared/cardano.start)
         echo "INIT_TIMESTAMP=$INIT_TIMESTAMP" >> $GITHUB_ENV
 
         epoch=0
         restart_count=0
         max_restarts=10
 
-        # Wait for the Partner Chain node to be ready or until max restarts or epoch 2 is reached
+        # Wait for partner-chains-node-1 to be ready or until max restarts or epoch 2 is reached
         while ! docker exec partner-chains-node-1 [ -e /shared/partner-chains-node-1.ready ]; do
           epoch=$(docker exec cardano-node-1 cardano-cli latest query tip --testnet-magic 42 | jq -r .epoch)
           echo "Epoch: $epoch"
@@ -78,108 +86,118 @@ runs:
           sleep 10
         done
       shell: bash
+
     - name: Collect Docker logs
       run: |
-        mkdir -p local-environment-logs-initial
+        mkdir -p local-environment-${{ inputs.markers }}-logs-initial
         docker ps -a --format '{{.Names}}' | while read line; do
           echo "Collecting logs for container $line"
-          docker logs "$line" > "local-environment-logs-initial/$line.log" 2>&1 || true
+          docker logs "$line" > "local-environment-${{ inputs.markers }}-logs-initial/$line.log" 2>&1 || true
         done
       shell: bash
+
     - name: Upload Docker logs artifact
       uses: actions/upload-artifact@v4
       with:
-        name: local-environment-logs-initial
-        path: local-environment-logs-initial/
+        name: local-environment-${{ inputs.markers }}-logs-initial
+        path: local-environment-${{ inputs.markers }}-logs-initial/
+
     - name: Fail the job
       if: ${{ steps.wait-pc-node.outcome == 'failure' }}
       run: exit 1
       shell: bash
-    - name: Run smoke tests
-      uses: ./.github/actions/tests/run-e2e-tests
-      with:
-        env: ${{ env.TEST_ENVIRONMENT }}
-        keyword: "test_get_status or test_get_params"
-        blockchain: substrate
-        local-environment: "true"
-    - name: Wait for epoch 2
+
+    - name: Wait for Epoch 2
       uses: ./.github/actions/tests/wait-for-epoch
       with:
         epoch: 2
         deployment: docker
         node: cardano-node-1
         environment:
+
     - name: Let PC warm up
       run: |
         sleep 30
       shell: bash
-    - name: Run all tests (do not verify full MC epoch)
+
+    - name: Run Epoch 2 Tests
+      if: ${{ inputs.markers != 'full' && inputs.markers != 'ariadne' && inputs.markers != 'delegator_rewards' }}
       uses: ./.github/actions/tests/run-e2e-tests
       with:
         env: ${{ env.TEST_ENVIRONMENT }}
         init_timestamp: ${{ env.INIT_TIMESTAMP }}
         blockchain: substrate
-        markers: "not probability and not rpc"
+        markers: ${{ inputs.markers }}
         local-environment: "true"
-    - name: Wait for epoch 3
-      if: ${{ inputs.tests == 'postmerge' }}
+
+    - name: Wait for Epoch 3
+      if: ${{ inputs.markers == 'full' || inputs.markers == 'ariadne' || inputs.markers == 'delegator_rewards' }}
       uses: ./.github/actions/tests/wait-for-epoch
       with:
         epoch: 3
         deployment: docker
         node: cardano-node-1
         environment:
-    - name: Run all tests (do not verify full MC epoch)
-      if: ${{ inputs.tests == 'postmerge' }}
+
+    - name: Run Epoch 3 Tests
+      if: ${{ inputs.markers == 'full' || inputs.markers == 'ariadne' || inputs.markers == 'delegator_rewards' }}
       uses: ./.github/actions/tests/run-e2e-tests
       with:
         env: ${{ env.TEST_ENVIRONMENT }}
         init_timestamp: ${{ env.INIT_TIMESTAMP }}
         blockchain: substrate
-        markers: "not probability"
+        markers: ${{ inputs.markers }}
         local-environment: "true"
-    - name: Wait for epoch 4
-      if: ${{ inputs.tests == 'postmerge' }}
+
+    - name: Wait for Epoch 4
+      if: ${{ inputs.markers == 'full' || inputs.markers == 'ariadne' }}
       uses: ./.github/actions/tests/wait-for-epoch
       with:
         epoch: 4
         deployment: docker
         node: cardano-node-1
         environment:
-    - name: Run all tests
-      if: ${{ inputs.tests == 'postmerge' }}
+
+    - name: Run Epoch 4 Tests
+      if: ${{ inputs.markers == 'full' || inputs.markers == 'ariadne' }}
       uses: ./.github/actions/tests/run-e2e-tests
       with:
         env: ${{ env.TEST_ENVIRONMENT }}
         mc_epoch: 3
         init_timestamp: ${{ env.INIT_TIMESTAMP }}
         blockchain: substrate
-        markers: "not probability and not reserve"
+        markers: ${{ inputs.markers }}
         local-environment: "true"
+
     - name: Check if no skipped tests
-      if: ${{ inputs.tests == 'postmerge' }}
       run: |
-        skipped=$(jq -r .summary.skipped e2e-tests/logs/.report.json)
-        if [ "$skipped" != "null" ]; then
-          echo "Skipped tests found: $skipped. Check test logs for more information."
-          exit 1
+        report_path="e2e-tests/${{ inputs.markers }}/logs/.report.json"
+        if [ -f "$report_path" ]; then
+          skipped=$(jq -r .summary.skipped "$report_path")
+          if [ "$skipped" != "null" ]; then
+            echo "Skipped tests found: $skipped. Check test logs for more information."
+            exit 1
+          fi
         fi
       shell: bash
+
     - name: Collect container logs
       if: always()
       run: |
-        mkdir -p local-environment-logs-full
+        mkdir -p local-environment-${{ inputs.markers }}-logs-full
         docker ps -a --format '{{.Names}}' | while read line; do
           echo "Collecting logs for container $line"
-          docker logs "$line" > "local-environment-logs-full/$line.log" 2>&1 || true
+          docker logs "$line" > "local-environment-${{ inputs.markers }}-logs-full/$line.log" 2>&1 || true
         done
       shell: bash
+
     - name: Upload container logs
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: local-environment-logs-full
-        path: local-environment-logs-full/
+        name: local-environment-${{ inputs.markers }}-logs-full
+        path: local-environment-${{ inputs.markers }}-logs-full/
+
     - name: Stop partner-chains-demo
       run: |
         cd dev/local-environment

.github/actions/tests/run-e2e-tests/action.yml

@@ -1,4 +1,5 @@
 name: 'Run Pytest Tests'
+
 description: 'Activate Python virtual environment and run end-to-end tests'
 
 inputs:
@@ -10,7 +11,7 @@ inputs:
     required: false
     default: 'test_'
   markers:
-    description: 'Run tests by markers (-m)'
+    description: 'Run tests by markers (-m). Available markers: smoke, rpc, reserve, governed_map, delegator_rewards, ariadne, wizards or full'
     required: false
   mc_epoch:
     description: 'MC epoch to test (committee tests)'
@@ -53,7 +54,9 @@ runs:
       shell: bash
       run: |
         markers_switch=""
-        if [ -n "${{ inputs.markers }}" ]; then
+        if [ "${{ inputs.markers }}" = "wizards" ]; then
+          markers_switch="-m smoke"
+        elif [ -n "${{ inputs.markers }}" ]; then
           markers_switch="-m '${{ inputs.markers }}'"
         fi
         
@@ -77,10 +80,10 @@ runs:
           decrypt_switch="--decrypt"
         fi
 
+        # Define pytest command
         pytest_cmd="pytest --blockchain '${{ inputs.blockchain }}' \
           --env '${{ inputs.env }}' \
           --log-cli-level '${{ inputs.log_level }}' \
-          -k '${{ inputs.keyword }}' \
           ${markers_switch} \
           -n '${{ inputs.threads}}' \
           --dist=loadgroup \
@@ -120,7 +123,7 @@ runs:
     - name: Upload test results
       uses: actions/upload-artifact@v4
       with:
-        name: test-results
+        name: test-results-${{ inputs.markers }}
         path: e2e-tests/logs
         overwrite: true
         if-no-files-found: error