Skip to content

Commit

Permalink
ci(l1): refactor asertoor job to use matrix. (#1390)
Browse files Browse the repository at this point in the history
**Motivation**
Simplifying the job and making it more DRY

**Description**
- Doesn't run asertoor on merge queue
- Fixes job skipping
  • Loading branch information
mpaulucci authored Dec 3, 2024
1 parent c6acab4 commit 1572f8c
Showing 1 changed file with 16 additions and 36 deletions.
52 changes: 16 additions & 36 deletions .github/workflows/ci_l1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,36 +101,21 @@ jobs:
name: ethrex_image
path: /tmp/ethrex_image.tar

run-assertoor-tx-check:
name: Assertoor - Transaction Check
run-assertoor:
name: Assertoor - ${{ matrix.name }}
runs-on: ubuntu-latest
needs: [docker_build]
steps:
- uses: actions/checkout@v4

- name: Download artifacts
uses: actions/download-artifact@v4
with:
name: ethrex_image
path: /tmp

- name: Load image
run: |
docker load --input /tmp/ethrex_image.tar
- name: Run assertoor
uses: ethpandaops/kurtosis-assertoor-github-action@v1
with:
enclave_name: "ethrex-assertoor-tx"
kurtosis_version: "1.4.2"
ethereum_package_url: "github.com/lambdaclass/ethereum-package"
ethereum_package_branch: "ethrex-integration"
ethereum_package_args: "./.github/config/assertoor/network_params_tx.yaml"
if: ${{ github.event_name != 'merge_group' }}
strategy:
matrix:
include:
- name: Transaction Check
enclave_name: "ethrex-assertoor-tx"
ethereum_package_args: "./.github/config/assertoor/network_params_tx.yaml"
- name: Blobs & Stability Check
enclave_name: "ethrex-assertoor-blob"
ethereum_package_args: "./.github/config/assertoor/network_params_blob.yaml"

run-assertoor-blob-check:
name: Assertoor - Blobs & Stability Check
runs-on: ubuntu-latest
needs: [docker_build]
steps:
- uses: actions/checkout@v4

Expand All @@ -147,11 +132,11 @@ jobs:
- name: Run assertoor
uses: ethpandaops/kurtosis-assertoor-github-action@v1
with:
enclave_name: "ethrex-assertoor-blob"
enclave_name: ${{ matrix.enclave_name }}
kurtosis_version: "1.4.2"
ethereum_package_url: "github.com/lambdaclass/ethereum-package"
ethereum_package_branch: "ethrex-integration"
ethereum_package_args: "./.github/config/assertoor/network_params_blob.yaml"
ethereum_package_args: ${{ matrix.ethereum_package_args }}

run-hive:
name: Hive - ${{ matrix.name }}
Expand Down Expand Up @@ -212,22 +197,17 @@ jobs:
# "Integration Test" is a required check, don't change the name
name: Integration Test
runs-on: ubuntu-latest
needs: [run-assertoor-tx-check, run-assertoor-blob-check, run-hive]
needs: [run-assertoor, run-hive]
# Make sure this job runs even if the previous jobs failed or were skipped
if: ${{ always() && needs.run-assertoor.result != 'skipped' && needs.run-hive.result != 'skipped' }}
steps:
- name: Check if any job failed
run: |
if [ "${{ needs.run-assertoor-tx-check.result }}" != "success" ]; then
if [ "${{ needs.run-assertoor.result }}" != "success" ]; then
echo "Job Assertoor Tx Check failed"
exit 1
fi
if [ "${{ needs.run-assertoor-blob-check.result }}" != "success" ]; then
echo "Job Assertoor Blob Check failed"
exit 1
fi
if [ "${{ needs.run-hive.result }}" != "success" ]; then
echo "Job Hive failed"
exit 1
Expand Down

0 comments on commit 1572f8c

Please sign in to comment.