Skip to content

Commit dfd7982

Browse files
NeoPlaysNeoPlays
authored
ADD: Update Script for Lighthouse Tag Removal (#2284)
* ADD: Update Script for Lighthouse Tag Removal * FIX: Tests
1 parent d308c23 commit dfd7982

File tree

10 files changed

+168
-1
lines changed

10 files changed

+168
-1
lines changed

‎.github/workflows/test-molecule.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
{ role: "update-changes", test: "242" },
7474
{ role: "update-changes", test: "243" },
7575
{ role: "update-changes", test: "244" },
76+
{ role: "update-changes", test: "245" },
7677
]
7778
fail-fast: false
7879
concurrency: molecule-test-${{ matrix.tests.role }}-${{ matrix.tests.test }}

‎controls/roles/update-changes/molecule/245/converge.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
- name: Converge
3+
hosts: all
4+
vars_files:
5+
- ../../../../defaults/stereum_defaults.yaml
6+
7+
tasks:
8+
- name: "Include update-changes"
9+
include_role:
10+
name: "update-changes"

‎controls/roles/update-changes/molecule/245/molecule.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
#dependency:
3+
# name: galaxy
4+
driver:
5+
name: docker
6+
platforms:
7+
- name: "update-changes--2.4.5--ubuntu-24.04"
8+
image: ubuntu:noble
9+
# - name: "configure-updates--default--centos-8"
10+
# image: geerlingguy/docker-centos8-ansible
11+
provisioner:
12+
name: ansible
13+
env:
14+
ANSIBLE_PIPELINING: "True"
15+
lint: |
16+
set -e
17+
yamllint .
18+
ansible-lint .
19+
scenario:
20+
test_sequence:
21+
- destroy
22+
- create
23+
- prepare
24+
- converge
25+
- idempotence
26+
- verify
27+
- destroy

‎controls/roles/update-changes/molecule/245/playbook.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
- name: Converge
3+
hosts: all
4+
tasks:
5+
- name: "Include update-changes"
6+
include_role:
7+
name: "update-changes"

‎controls/roles/update-changes/molecule/245/prepare.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
---
2+
- name: Prepare
3+
hosts: all
4+
tasks:
5+
- name: Make sure Stereum's config path exists
6+
file:
7+
path: "/etc/stereum/services"
8+
state: directory
9+
owner: "root"
10+
group: "root"
11+
mode: 0644
12+
become: yes
13+
14+
- name: Create LighthouseBeaconService config
15+
copy:
16+
dest: "/etc/stereum/services/365500b1-285c-f88d-7d6c-3cde7b3ed973.yaml"
17+
owner: "root"
18+
group: "root"
19+
mode: 0644
20+
content: |
21+
service: LighthouseBeaconService
22+
id: 365500b1-285c-f88d-7d6c-3cde7b3ed973
23+
configVersion: 1
24+
command:
25+
- lighthouse
26+
- bn
27+
- --debug-level=info
28+
- --network=hoodi
29+
- --execution-endpoint=http://stereum-foo-bar:8551
30+
- --execution-jwt=/engine.jwt
31+
- --eth1-blocks-per-log-query=150
32+
- --datadir=/opt/app/beacon
33+
- --http
34+
- --http-address=0.0.0.0
35+
- --metrics
36+
- --metrics-address=0.0.0.0
37+
- --disable-upnp
38+
- --validator-monitor-auto
39+
- --slasher
40+
- --slasher-dir=/opt/app/slasher
41+
- --port=9000
42+
- --enr-tcp-port=9000
43+
- --enr-udp-port=9000
44+
- --builder=http://stereum-foo-bar:18550
45+
- --checkpoint-sync-url=https://hoodi.beaconstate.ethstaker.cc
46+
entrypoint: []
47+
env: {}
48+
image: sigp/lighthouse:v8.0.0-rc.1
49+
ports:
50+
- 0.0.0.0:9000:9000/tcp
51+
- 0.0.0.0:9000:9000/udp
52+
- 0.0.0.0:5052:5052/tcp
53+
volumes:
54+
- /opt/stereum/lighthouse-365500b1-285c-f88d-7d6c-3cde7b3ed973/beacon:/opt/app/beacon
55+
- /opt/stereum/lighthouse-365500b1-285c-f88d-7d6c-3cde7b3ed973/slasher:/opt/app/slasher
56+
user: "2000"
57+
autoupdate: true
58+
network: hoodi
59+
dependencies:
60+
executionClients: []
61+
consensusClients: []
62+
mevboost: []
63+
otherServices: []
64+
become: yes
65+
# EOF

‎controls/roles/update-changes/molecule/245/verify.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
- name: Verify
3+
hosts: all
4+
gather_facts: false
5+
tasks:
6+
# LighthouseBeaconService
7+
- name: Read LighthouseBeaconService file
8+
slurp:
9+
src: "/etc/stereum/services/365500b1-285c-f88d-7d6c-3cde7b3ed973.yaml"
10+
register: Lighthouse_service_configuration_raw
11+
12+
- name: Parse Service configurations
13+
set_fact:
14+
Lighthouse_service_configuration: "{{ Lighthouse_service_configuration_raw['content'] | b64decode | from_yaml }}"
15+
16+
- debug:
17+
msg: "{{ Lighthouse_service_configuration }}"
18+
- debug:
19+
msg: "{{ Lighthouse_service_configuration_raw['content'] | b64decode }}"
20+
21+
- assert:
22+
that:
23+
- Lighthouse_service_configuration.command | select('match', '--eth1-blocks-per-log-query') | length == 0
24+
# EOF

‎controls/roles/update-changes/tasks/2.4.5/lighthouse_changes.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
- name: Read service file
3+
slurp:
4+
src: "{{ config_file.path }}"
5+
register: service_configuration_raw
6+
7+
- name: Parse service's configuration
8+
set_fact:
9+
service_configuration: "{{ service_configuration_raw['content'] | b64decode | from_yaml }}"
10+
service_configuration_text: "{{ service_configuration_raw['content'] | b64decode }}"
11+
12+
- name: Lighthouse Changes
13+
when: service_configuration.service == "LighthouseBeaconService"
14+
block:
15+
- name: remove --eth1-blocks-per-log-query
16+
lineinfile:
17+
path: "{{ config_file.path }}"
18+
regex: "--eth1-blocks-per-log-query"
19+
state: absent

‎controls/roles/update-changes/tasks/2.4.5/updates-245.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
- name: Find service configs
3+
find:
4+
paths: "/etc/stereum/services"
5+
register: service_config_files
6+
7+
- name: Include Lighthouse Changes
8+
include_tasks: lighthouse_changes.yaml
9+
loop: "{{ service_config_files.files }}"
10+
loop_control:
11+
loop_var: config_file

‎controls/roles/update-changes/tasks/main.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@
1717
- name: Include 2.4.4 Update Scripts
1818
include_tasks: "2.4.4/updates-244.yaml"
1919
ignore_errors: true
20+
21+
- name: Include 2.4.5 Update Scripts
22+
include_tasks: "2.4.5/updates-245.yaml"
23+
ignore_errors: true
2024
# EOF

‎launcher/src/backend/ethereum-services/LighthouseBeaconService.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export class LighthouseBeaconService extends NodeService {
4848
`--network=${network}`,
4949
`--execution-endpoint=${eth1Nodes}`,
5050
`--execution-jwt=${JWTDir}`,
51-
"--eth1-blocks-per-log-query=150",
5251
`--datadir=${dataDir}`,
5352
"--http",
5453
"--http-address=0.0.0.0",

0 commit comments

Comments
 (0)