fix: mc epoch to wait for

Author: rsporny

.github/actions/tests/staging-preview-tests/action.yml

@@ -1,12 +1,5 @@
-name: "Test Against Staging Preview Environment"
-description: "Tests against Staging Preview Environment"
-inputs:
-  node-host:
-    description: "Host for the node"
-    required: true
-  node-port:
-    description: "Port for the node"
-    required: true
+name: "Install and configure kubectl and awscli"
+description: "Install and configure kubectl and awscli (used in e2e tests)"
 
 outputs: {}
 
@@ -28,15 +21,3 @@ runs:
         kubectl config set-context my-context --cluster=my-cluster --user=github-actions --namespace=default
         kubectl config use-context my-context
       shell: bash
-    - name: Health check integration env
-      run: |
-        curl --request POST \
-          --url "http://${{ inputs['node-host'] }}:${{ inputs['node-port'] }}" \
-          --header 'Content-Type: application/json' \
-          --data '{
-          "jsonrpc": "2.0",
-          "method": "sidechain_getStatus",
-          "params": [],
-          "id": 1
-        }'
-      shell: bash

.github/actions/tests/wait-for-epoch/action.yml

@@ -34,7 +34,7 @@ runs:
           if [ "${{ inputs.environment }}" == "staging-preview" ]; then
             testnet_magic=2 
           elif [ "${{ inputs.environment }}" == "staging-preprod" ]; then
-            testnet_magic=1 
+            testnet_magic=1
           else
             echo "Invalid environment for Kubernetes deployment"
             exit 1

.github/workflows/cd.yml

@@ -20,6 +20,7 @@ permissions:
 env:
   AWS_REGION: "eu-central-1"
   SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+  STAGING_PREVIEW_SERVICES_HOST: staging-preview-services-service.staging-preview.svc.cluster.local
   STAGING_PREVIEW_VALIDATOR_1_HOST: staging-preview-validator-1-service.staging-preview.svc.cluster.local
   STAGING_PREVIEW_VALIDATOR_1_PORT: 9933
 
@@ -176,7 +177,13 @@ jobs:
   partner-chain-ready:
     runs-on: [self-hosted, eks]
     needs: deploy-staging-preview
+    outputs:
+      deployment_mc_epoch: ${{ steps.mc-epoch.outputs.deployment_mc_epoch }}
     steps:
+      - name: Set deployment main chain epoch
+        id: mc-epoch
+        run: echo "deployment_mc_epoch=$(curl -s http://$STAGING_PREVIEW_SERVICES_HOST:1337/health | jq .currentEpoch)" >> $GITHUB_OUTPUT
+        shell: bash
       - name: Check Finalization Status
         run: |
           FINALIZED_NUMBER=$(
@@ -204,9 +211,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Configure kubectl
         uses: ./.github/actions/tests/staging-preview-tests
-        with:
-          node-host: $STAGING_PREVIEW_VALIDATOR_1_HOST
-          node-port: $STAGING_PREVIEW_VALIDATOR_1_PORT
         env:
           kubeconfig_base64: ${{ secrets.kubeconfig_base64 }}
           K8S_SERVER: ${{ secrets.K8S_SERVER }}
@@ -234,9 +238,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Configure kubectl
         uses: ./.github/actions/tests/staging-preview-tests
-        with:
-          node-host: $STAGING_PREVIEW_VALIDATOR_1_HOST
-          node-port: $STAGING_PREVIEW_VALIDATOR_1_PORT
         env:
           kubeconfig_base64: ${{ secrets.kubeconfig_base64 }}
           K8S_SERVER: ${{ secrets.K8S_SERVER }}
@@ -245,18 +246,16 @@ jobs:
         uses: ./.github/actions/tests/setup-python
         env:
           ACTIONS_PAT: ${{ secrets.ACTIONS_PAT }}
-      - name: Save deployment main chain epoch
-        run: |
-          echo "DEPLOYMENT_MC_EPOCH=$(curl -s http://staging-preview-services-service.staging-preview.svc.cluster.local:1337/health | jq .currentEpoch)" >> $GITHUB_ENV
-        shell: bash
       - name: Run all tests (some skipped due to new deployment)
         uses: ./.github/actions/tests/run-e2e-tests
+        env:
+          DEPLOYMENT_MC_EPOCH: ${{needs.partner-chain-ready.outputs.deployment_mc_epoch}}
         with:
           blockchain: substrate
           env: staging
           decrypt: true
           markers: "not active_flow and not passive_flow"
-          deployment_mc_epoch: ${{ env.DEPLOYMENT_MC_EPOCH }}
+          deployment_mc_epoch: $DEPLOYMENT_MC_EPOCH
 
   wait-for-next-epoch:
     permissions:
@@ -269,15 +268,17 @@ jobs:
         uses: actions/checkout@v4
       - name: Set MC epoch to wait for
         id: increment-epoch
+        env:
+          DEPLOYMENT_MC_EPOCH: ${{needs.partner-chain-ready.outputs.deployment_mc_epoch}}
         run: |
           echo "Current epoch: $DEPLOYMENT_MC_EPOCH"
           incremented_epoch=$((DEPLOYMENT_MC_EPOCH + 1))
           echo "Incremented epoch: $incremented_epoch"
-          echo "::set-output name=epoch::$incremented_epoch"
+          echo "mc_epoch_to_wait_for=$incremented_epoch" >> $GITHUB_OUTPUT
       - name: Wait for next MC epoch
         uses: ./.github/actions/tests/wait-for-epoch
         with:
-          epoch: ${{ steps.increment-epoch.outputs.epoch }}"
+          epoch: ${{ steps.increment-epoch.outputs.mc_epoch_to_wait_for }}"
           deployment: kubernetes
           node: staging-preview-validator-1
           environment: staging-preview
@@ -293,9 +294,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Configure kubectl
         uses: ./.github/actions/tests/staging-preview-tests
-        with:
-          node-host: $STAGING_PREVIEW_VALIDATOR_1_HOST
-          node-port: $STAGING_PREVIEW_VALIDATOR_1_PORT
         env:
           kubeconfig_base64: ${{ secrets.kubeconfig_base64 }}
           K8S_SERVER: ${{ secrets.K8S_SERVER }}
@@ -306,13 +304,15 @@ jobs:
           ACTIONS_PAT: ${{ secrets.ACTIONS_PAT }}
       - name: Run all tests (some skipped due to new deployment)
         uses: ./.github/actions/tests/run-e2e-tests
+        env:
+          DEPLOYMENT_MC_EPOCH: ${{needs.partner-chain-ready.outputs.deployment_mc_epoch}}
         with:
           blockchain: substrate
           env: staging
           decrypt: true
           latest_mc_epoch: true
           markers: "not active_flow and not passive_flow"
-          deployment_mc_epoch: ${{ env.DEPLOYMENT_MC_EPOCH }}
+          deployment_mc_epoch: $DEPLOYMENT_MC_EPOCH
 
 #  build-and-publish-ghcr:
 #    permissions: