From 09e799f9cd21667a5258522bf2469ffe8ded510f Mon Sep 17 00:00:00 2001
From: Somnath Banerjee <snb895@outlook.com>
Date: Fri, 17 Jan 2025 22:33:38 +0400
Subject: [PATCH] Fix hive EEST tests and disable pectra assertoor

---
 .github/workflows/kurtosis/pectra.io          |  9 ++++-----
 .github/workflows/test-hive-eest.yml          |  6 +++---
 .github/workflows/test-kurtosis-assertoor.yml | 14 +++++++-------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/kurtosis/pectra.io b/.github/workflows/kurtosis/pectra.io
index bf627a67504..af1e0e374e5 100644
--- a/.github/workflows/kurtosis/pectra.io
+++ b/.github/workflows/kurtosis/pectra.io
@@ -3,10 +3,10 @@ participants_matrix:
     - el_type: erigon
       el_image: test/erigon:current
   cl:
-    - cl_type: lighthouse
-      cl_image: ethpandaops/lighthouse:pawan-electra-alpha7-0dd215c
     - cl_type: teku
-      cl_image: ethpandaops/teku:mekong
+      cl_image: consensys/teku:develop
+    - cl_type: lodestar
+      cl_image: ethpandaops/lodestar:devnet-5-1c2b5ed
 network_params:
   electra_fork_epoch: 1
   min_validator_withdrawability_delay: 1
@@ -19,5 +19,4 @@ assertoor_params:
   run_stability_check: false
   run_block_proposal_check: true
   tests:
-    - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/all.yaml"}
-
+    - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/all.yaml"}
\ No newline at end of file
diff --git a/.github/workflows/test-hive-eest.yml b/.github/workflows/test-hive-eest.yml
index a9cc05142d2..dcd09448706 100644
--- a/.github/workflows/test-hive-eest.yml
+++ b/.github/workflows/test-hive-eest.yml
@@ -14,8 +14,8 @@ jobs:
       - name: Checkout Hive
         uses: actions/checkout@v4
         with:
-          repository: danceratopz/hive
-          ref: prague-devnet-4
+          repository: ethereum/hive
+          # ref: prague-devnet-4
           path: hive
       - name: Setup go env and cache
         uses: actions/setup-go@v5
@@ -47,7 +47,7 @@ jobs:
             echo -e "\n\n============================================================"
             echo "Running test: ${1}"
             echo -e "\n"
-            ./hive --sim 'ethereum/eest/consume-engine' --client erigon 2>&1 | tee output.log || {
+            ./hive --sim 'ethereum/eest/consume-engine' --client erigon --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/pectra-devnet-5%40v1.1.0/fixtures_pectra-devnet-5.tar.gz --sim.buildarg branch=pectra-devnet-5 2>&1 | tee output.log || {
               if [ $? -gt 0 ]; then
                 echo "Exitcode gt 0"
               fi
diff --git a/.github/workflows/test-kurtosis-assertoor.yml b/.github/workflows/test-kurtosis-assertoor.yml
index fe50f7344fa..e40ace314dd 100644
--- a/.github/workflows/test-kurtosis-assertoor.yml
+++ b/.github/workflows/test-kurtosis-assertoor.yml
@@ -39,10 +39,10 @@ jobs:
             kurtosis_extra_args: --verbosity detailed --cli-log-level trace
             persistent_logs: "true"
 
-      - name: Run Pectra Kurtosis + assertoor tests
-        uses: ethpandaops/kurtosis-assertoor-github-action@v1
-        with:
-            enclave_name: "kurtosis-run2-${{ github.run_id }}"
-            ethereum_package_args: ".github/workflows/kurtosis/pectra.io"
-            kurtosis_extra_args: --verbosity detailed --cli-log-level trace
-            persistent_logs: "true"
+      # - name: Run Pectra Kurtosis + assertoor tests
+      #   uses: ethpandaops/kurtosis-assertoor-github-action@v1
+      #   with:
+      #       enclave_name: "kurtosis-run2-${{ github.run_id }}"
+      #       ethereum_package_args: ".github/workflows/kurtosis/pectra.io"
+      #       kurtosis_extra_args: --verbosity detailed --cli-log-level trace
+      #       persistent_logs: "true"