updating to post merge

parithosh · Oct 20, 2022 · 719e3e3 · 719e3e3
1 parent da6b7c6
commit 719e3e3
Show file tree

Hide file tree

Showing 16 changed files with 198 additions and 382 deletions.
diff --git a/.github/workflows/cl-besu.yml b/.github/workflows/cl-besu.yml
@@ -46,10 +46,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/[email protected]
         with:
-          template: ./cl-besu.json.j2
-          output_file: ./majority-besu.json
+          template: ./cl-besu.yaml.j2
+          output_file: ./majority-besu.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
           NIMBUS_IMAGE: ${{ steps.fetch_image_name.outputs.nimbus_image }}
@@ -59,7 +59,7 @@ jobs:
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
           BESU_IMAGE: ${{ steps.fetch_image_name.outputs.besu_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-besu.json)"
+        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-besu.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.enclave_name }}

diff --git a/.github/workflows/cl-erigon.yml b/.github/workflows/cl-erigon.yml
@@ -40,10 +40,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/[email protected]
         with:
-          template: ./cl-erigon.json.j2
-          output_file: ./majority-erigon.json
+          template: ./cl-erigon.yaml.j2
+          output_file: ./majority-erigon.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           ERIGON_IMAGE: ${{ steps.fetch_image_name.outputs.erigon_image }}
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
@@ -53,7 +53,7 @@ jobs:
           LODESTAR_IMAGE: ${{ steps.fetch_image_name.outputs.lodestar_image }}
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-erigon.json)"
+        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-erigon.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.enclave_name }}

diff --git a/.github/workflows/cl-geth.yml b/.github/workflows/cl-geth.yml
@@ -45,10 +45,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/[email protected]
         with:
-          template: ./cl-geth.json.j2
-          output_file: ./majority-geth.json
+          template: ./cl-geth.yaml.j2
+          output_file: ./majority-geth.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
           NIMBUS_IMAGE: ${{ steps.fetch_image_name.outputs.nimbus_image }}
@@ -58,7 +58,7 @@ jobs:
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
           NETHERMIND_IMAGE: ${{ steps.fetch_image_name.outputs.nethermind_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-geth.json)"
+        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-geth.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.enclave_name }}

diff --git a/.github/workflows/cl-nethermind.yml b/.github/workflows/cl-nethermind.yml
@@ -46,10 +46,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/[email protected]
         with:
-          template: ./cl-nethermind.json.j2
-          output_file: ./majority-nethermind.json
+          template: ./cl-nethermind.yaml.j2
+          output_file: ./majority-nethermind.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
           NIMBUS_IMAGE: ${{ steps.fetch_image_name.outputs.nimbus_image }}
@@ -59,7 +59,7 @@ jobs:
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
           NETHERMIND_IMAGE: ${{ steps.fetch_image_name.outputs.nethermind_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-nethermind.json)"
+        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-nethermind.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.enclave_name }}

diff --git a/.github/workflows/multiclient.yml b/.github/workflows/multiclient.yml
@@ -44,10 +44,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/[email protected]
         with:
-          template: ./config.json.j2
-          output_file: ./config.json
+          template: ./config.yaml.j2
+          output_file: ./config.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
           NIMBUS_IMAGE: ${{ steps.fetch_image_name.outputs.nimbus_image }}
@@ -57,7 +57,7 @@ jobs:
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
           NETHERMIND_IMAGE: ${{ steps.fetch_image_name.outputs.nethermind_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id newname ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./config.json)"
+        run: kurtosis module exec --enclave-id newname ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./config.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump newname dumped_logs

diff --git a/cl-besu.json.j2 b/cl-besu.json.j2
diff --git a/cl-besu.yaml.j2 b/cl-besu.yaml.j2
@@ -0,0 +1,35 @@
+participants:
+- elType: besu
+  elImage: "{{ env['BESU_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: besu
+  elImage: "{{ env['BESU_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: besu
+  elImage: "{{ env['BESU_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+- elType: besu
+  elImage: "{{ env['BESU_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+network:
+  networkId: '3151908'
+  depositContractAddress: '0x4242424242424242424242424242424242424242'
+  secondsPerSlot: 12
+  slotsPerEpoch: 32
+  altairForkEpoch: 0
+  mergeForkEpoch: 0
+  totalTerminalDifficulty: 0
+  numValidatorKeysPerNode: 64
+  preregisteredValidatorKeysMnemonic: giant issue aisle success illegal bike spike
+    question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy
+    very lucky have athlete
+waitForMining: false
+waitForFinalization: true
+waitForVerifications: true
+verificationsEpochLimit: 5
+logLevel: info
+
diff --git a/cl-erigon.json.j2 b/cl-erigon.json.j2
diff --git a/cl-erigon.yaml.j2 b/cl-erigon.yaml.j2
@@ -0,0 +1,34 @@
+participants:
+- elType: erigon
+  elImage: "{{ env['ERIGON_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: erigon
+  elImage: "{{ env['ERIGON_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: erigon
+  elImage: "{{ env['ERIGON_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+- elType: erigon
+  elImage: "{{ env['ERIGON_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+network:
+  networkId: '3151908'
+  depositContractAddress: '0x4242424242424242424242424242424242424242'
+  secondsPerSlot: 12
+  slotsPerEpoch: 32
+  altairForkEpoch: 0
+  mergeForkEpoch: 0
+  totalTerminalDifficulty: 0
+  numValidatorKeysPerNode: 64
+  preregisteredValidatorKeysMnemonic: giant issue aisle success illegal bike spike
+    question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy
+    very lucky have athlete
+waitForMining: false
+waitForFinalization: true
+waitForVerifications: true
+verificationsEpochLimit: 5
+logLevel: info