Skip to content

Commit c8a9e9f

Browse files
NeoPlaysNeoPlays
authored
REMOVE: NotificationService (#2276)
* REMOVE: NotificationService * FIX: Integration Tests * UPDATE: `.gitignore` so `package-lock.json` is pushed * ADJUST: Integration Test Workflow * FIX: make tests silent * REFACTOR: define test commands in package.json * FIX: Format * FIX: `LighthouseBeaconService.int.js` and add old workflow tagged with `-legacy`
1 parent 8d8fab0 commit c8a9e9f

40 files changed

+21615
-523
lines changed

‎.github/workflows/test-integration-legacy.yml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Tests Integration
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
workflow_dispatch:
8+
9+
jobs:
10+
setup:
11+
runs-on: ubuntu-22.04
12+
outputs:
13+
importTests: ${{ steps.get-import-tests.outputs.tests }}
14+
ELTests: ${{ steps.get-EL-tests.outputs.tests }}
15+
otherTests: ${{ steps.get-other-tests.outputs.tests }}
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-node@v4
19+
with:
20+
node-version: "19"
21+
- run: npm install
22+
working-directory: ./launcher
23+
- id: get-import-tests
24+
name: Get Import Tests
25+
run: echo "::set-output name=tests::$(npx jest --listTests --json | jq -cM '[.[] | select(contains(".int") and contains("Beacon")) | split("/") | .[length-1:][]] | to_entries | map({id:.key, name:.value})')"
26+
working-directory: ./launcher
27+
- id: get-EL-tests
28+
name: Get EL Tests
29+
run: echo "::set-output name=tests::$(npx jest --listTests --json | jq -cM '[.[] | select(contains(".int") and contains("Service") and (contains("Beacon") | not )) | split("/") | .[length-1:][]] | to_entries | map({id:.key, name:.value})')"
30+
working-directory: ./launcher
31+
- id: get-other-tests
32+
name: Get Other Tests
33+
run: echo "::set-output name=tests::$(npx jest --listTests --json | jq -cM '[.[] | select(contains(".int") and (contains("Service") | not )) | split("/") | .[length-1:][]] | to_entries | map({id:.key, name:.value})')"
34+
working-directory: ./launcher
35+
36+
Validator-Import-test:
37+
runs-on: ubuntu-22.04
38+
name: test ${{ matrix.test.name }}
39+
needs:
40+
- setup
41+
- Other-Integration-test
42+
- Execution-Client-test
43+
strategy:
44+
matrix:
45+
test: ${{ fromJson(needs.setup.outputs.importTests) }}
46+
steps:
47+
- uses: actions/checkout@v4
48+
- uses: actions/setup-node@v4
49+
with:
50+
node-version: "19"
51+
- run: npm install
52+
working-directory: ./launcher
53+
- run: npm run test ${{ matrix.test.name }}
54+
working-directory: ./launcher
55+
env:
56+
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
57+
IS_DEV: "true"
58+
59+
Execution-Client-test:
60+
runs-on: ubuntu-22.04
61+
name: test ${{ matrix.test.name }}
62+
needs:
63+
- setup
64+
- Other-Integration-test
65+
strategy:
66+
matrix:
67+
test: ${{ fromJson(needs.setup.outputs.ELTests) }}
68+
steps:
69+
- uses: actions/checkout@v4
70+
- uses: actions/setup-node@v4
71+
with:
72+
node-version: "19"
73+
- run: npm install
74+
working-directory: ./launcher
75+
- run: npm run test ${{ matrix.test.name }}
76+
working-directory: ./launcher
77+
env:
78+
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
79+
IS_DEV: "true"
80+
81+
Other-Integration-test:
82+
runs-on: ubuntu-22.04
83+
name: test ${{ matrix.test.name }}
84+
needs:
85+
- setup
86+
strategy:
87+
matrix:
88+
test: ${{ fromJson(needs.setup.outputs.otherTests) }}
89+
steps:
90+
- uses: actions/checkout@v4
91+
- uses: actions/setup-node@v4
92+
with:
93+
node-version: "19"
94+
- run: npm install
95+
working-directory: ./launcher
96+
- run: npm run test ${{ matrix.test.name }}
97+
working-directory: ./launcher
98+
env:
99+
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
100+
IS_DEV: "true"

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

Lines changed: 12 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,93 +7,54 @@ on:
77
workflow_dispatch:
88

99
jobs:
10-
setup:
11-
runs-on: ubuntu-22.04
12-
outputs:
13-
importTests: ${{ steps.get-import-tests.outputs.tests }}
14-
ELTests: ${{ steps.get-EL-tests.outputs.tests }}
15-
otherTests: ${{ steps.get-other-tests.outputs.tests }}
16-
steps:
17-
- uses: actions/checkout@v4
18-
- uses: actions/setup-node@v4
19-
with:
20-
node-version: "19"
21-
- run: npm install
22-
working-directory: ./launcher
23-
- id: get-import-tests
24-
name: Get Import Tests
25-
run: echo "::set-output name=tests::$(npx jest --listTests --json | jq -cM '[.[] | select(contains(".int") and contains("Beacon")) | split("/") | .[length-1:][]] | to_entries | map({id:.key, name:.value})')"
26-
working-directory: ./launcher
27-
- id: get-EL-tests
28-
name: Get EL Tests
29-
run: echo "::set-output name=tests::$(npx jest --listTests --json | jq -cM '[.[] | select(contains(".int") and contains("Service") and (contains("Beacon") | not )) | split("/") | .[length-1:][]] | to_entries | map({id:.key, name:.value})')"
30-
working-directory: ./launcher
31-
- id: get-other-tests
32-
name: Get Other Tests
33-
run: echo "::set-output name=tests::$(npx jest --listTests --json | jq -cM '[.[] | select(contains(".int") and (contains("Service") | not )) | split("/") | .[length-1:][]] | to_entries | map({id:.key, name:.value})')"
34-
working-directory: ./launcher
35-
3610
Validator-Import-test:
37-
runs-on: ubuntu-22.04
38-
name: test ${{ matrix.test.name }}
11+
runs-on: ubuntu-24.04
12+
name: Validator Import Tests
3913
needs:
40-
- setup
4114
- Other-Integration-test
4215
- Execution-Client-test
43-
strategy:
44-
matrix:
45-
test: ${{ fromJson(needs.setup.outputs.importTests) }}
4616
steps:
4717
- uses: actions/checkout@v4
4818
- uses: actions/setup-node@v4
4919
with:
50-
node-version: "19"
20+
node-version: "22"
5121
- run: npm install
5222
working-directory: ./launcher
53-
- run: npm run test ${{ matrix.test.name }}
23+
- run: npm run test:beacon
5424
working-directory: ./launcher
5525
env:
5626
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
5727
IS_DEV: "true"
5828

5929
Execution-Client-test:
60-
runs-on: ubuntu-22.04
61-
name: test ${{ matrix.test.name }}
30+
runs-on: ubuntu-24.04
31+
name: Execution Client Tests
6232
needs:
63-
- setup
6433
- Other-Integration-test
65-
strategy:
66-
matrix:
67-
test: ${{ fromJson(needs.setup.outputs.ELTests) }}
6834
steps:
6935
- uses: actions/checkout@v4
7036
- uses: actions/setup-node@v4
7137
with:
72-
node-version: "19"
38+
node-version: "22"
7339
- run: npm install
7440
working-directory: ./launcher
75-
- run: npm run test ${{ matrix.test.name }}
41+
- run: npm run test:service
7642
working-directory: ./launcher
7743
env:
7844
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
7945
IS_DEV: "true"
8046

8147
Other-Integration-test:
82-
runs-on: ubuntu-22.04
83-
name: test ${{ matrix.test.name }}
84-
needs:
85-
- setup
86-
strategy:
87-
matrix:
88-
test: ${{ fromJson(needs.setup.outputs.otherTests) }}
48+
runs-on: ubuntu-24.04
49+
name: Other Integration Tests
8950
steps:
9051
- uses: actions/checkout@v4
9152
- uses: actions/setup-node@v4
9253
with:
93-
node-version: "19"
54+
node-version: "22"
9455
- run: npm install
9556
working-directory: ./launcher
96-
- run: npm run test ${{ matrix.test.name }}
57+
- run: npm run test:other
9758
working-directory: ./launcher
9859
env:
9960
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
{ role: "update-changes", test: "232" },
7272
{ role: "update-changes", test: "235" },
7373
{ role: "update-changes", test: "242" },
74+
{ role: "update-changes", test: "243" },
7475
]
7576
fail-fast: false
7677
concurrency: molecule-test-${{ matrix.tests.role }}-${{ matrix.tests.test }}
@@ -496,8 +497,7 @@ jobs:
496497
# {role: "manage-service", test: "nethermind-lighthouse"},
497498
#{ role: "manage-service", test: "nethermind-nimbus" },
498499
# {role: "manage-service", test: "nethermind-prysm"},
499-
# {role: "manage-service", test: "nethermind-teku"},
500-
{ role: "manage-service", test: "notifications" },
500+
# {role: "manage-service", test: "nethermind-teku"}
501501
]
502502
fail-fast: false
503503
concurrency: molecule-test-${{ matrix.tests.role }}-${{ matrix.tests.test }}

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.DS_Store
22
node_modules
3-
package-lock.json
43
/launcher/dist
54

65
# local env files

‎controls/defaults/stereum_defaults.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
stereum_static:
22
defaults:
33
controls_install_path: /opt/stereum
4-
cloud:
5-
notifications_api_key: 4cTLZL8gcZ5knP49murPh2qaZSchryfHraHQHFDPuuA8jqJLrSdr7Bd4s4TSSVBW
64
updates:
75
lane: stable
86
unattended:
@@ -36,7 +34,6 @@ stereum_static:
3634
grafana: "10.1.5"
3735
node_exporter: v1.6.1
3836
prometheus: v2.47.2
39-
notifications: v1.1.0
4037

4138
devnet:
4239
# consensus clients

‎controls/roles/manage-service/molecule/notifications/converge.yml‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎controls/roles/manage-service/molecule/notifications/playbook.yml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)