Skip to content

Commit 3599f37

Browse files
authored
ADJUST: Tests (#2286)
* ADJUST: PrysmBeaconService.int Assertions * REMOVE: upgrade-prep workflow
1 parent d5fc10b commit 3599f37

File tree

2 files changed

+2
-55
lines changed

2 files changed

+2
-55
lines changed

.github/workflows/test-molecule.yml

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -124,59 +124,6 @@ jobs:
124124
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
125125
ansible_python_interpreter: "/usr/bin/python3"
126126

127-
upgrade-prep:
128-
strategy:
129-
matrix:
130-
tests: [{ role: "upgrade-prep", test: "default" }]
131-
fail-fast: false
132-
concurrency: molecule-test-${{ matrix.tests.role }}-${{ matrix.tests.test }}
133-
runs-on: ubuntu-22.04
134-
steps:
135-
- uses: actions/checkout@v5
136-
- name: Set up Python
137-
uses: actions/setup-python@v4
138-
with:
139-
python-version: "3.10"
140-
- name: Install depencencies
141-
run: |
142-
pip install ansible==10.3.0
143-
pip install molecule==24.8.0
144-
pip install "molecule[docker.lint]"
145-
pip install molecule-docker
146-
pip install molecule-hetznercloud
147-
pip install docker
148-
pip install hcloud
149-
ansible-galaxy collection install community.docker
150-
- name: Install dependency for pipx
151-
run: |
152-
/opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
153-
/opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
154-
/opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
155-
/opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
156-
/opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
157-
/opt/pipx/venvs/ansible-core/bin/python -m pip install docker
158-
/opt/pipx/venvs/ansible-core/bin/python -m pip install hcloud
159-
- name: Install ansible-lint
160-
run: sudo apt-get install -y ansible-lint
161-
- name: Molecule version
162-
run: molecule --version
163-
env:
164-
ansible_python_interpreter: "/usr/bin/python3"
165-
- name: Run tests
166-
working-directory: ./controls/roles/${{ matrix.tests.role }}
167-
run: molecule test -s ${{ matrix.tests.test }}
168-
env:
169-
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
170-
ansible_python_interpreter: "/usr/bin/python3"
171-
# destroying is necessary when previous task failed and didn't clean up properly
172-
- name: Destroy previous testing VMs
173-
if: ${{ failure() || cancelled() }}
174-
working-directory: ./controls/roles/${{ matrix.tests.role }}
175-
run: molecule destroy -s ${{ matrix.tests.test }}
176-
env:
177-
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
178-
ansible_python_interpreter: "/usr/bin/python3"
179-
180127
switch-repos:
181128
strategy:
182129
matrix:

launcher/src/backend/tests/integration/PrysmBeaconService.int.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ test("prysm validator import", async () => {
122122
/Starting initial chain sync/.test(BCstatus.stderr) &&
123123
/Connected peers/.test(BCstatus.stderr) &&
124124
/Connected to new endpoint/.test(BCstatus.stderr) &&
125-
/Beacon chain started/.test(VCstatus.stderr) &&
125+
/Starting validator node/.test(VCstatus.stderr) &&
126126
/Waiting for beacon node to sync to latest chain head/.test(VCstatus.stderr)
127127
) {
128128
condition = true;
@@ -185,7 +185,7 @@ test("prysm validator import", async () => {
185185
expect(BCstatus.stderr).toMatch(/Connected to new endpoint/);
186186

187187
//check prysm VC logs
188-
expect(VCstatus.stderr).toMatch(/Beacon chain started/);
188+
expect(VCstatus.stderr).toMatch(/Starting validator node/);
189189
expect(VCstatus.stderr).toMatch(/Waiting for beacon node to sync to latest chain head/);
190190
expect(runningValidator).toMatch(/Showing .{1} validator accounts/);
191191
});

0 commit comments

Comments
 (0)