From a5ca5fea33fa9eb3ac0d6cbfb4c83c10489ab85e Mon Sep 17 00:00:00 2001 From: aya Date: Mon, 25 Nov 2024 08:10:58 +0200 Subject: [PATCH 01/12] Change number of threads for CI runners to 8 --- .github/workflows/test_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index fc5a36c2..c3382773 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -53,7 +53,7 @@ jobs: - name: Run tests run: | - pytest -n 4 --dist loadgroup --reruns 2 --alluredir=allure-results + pytest -n 8 --dist loadgroup --reruns 2 --alluredir=allure-results - name: Get allure history if: always() From 2a9b91969a1c180b12b1aa94e4e08182e373c1aa Mon Sep 17 00:00:00 2001 From: aya Date: Mon, 25 Nov 2024 09:22:50 +0200 Subject: [PATCH 02/12] change number of threads to 12 --- .github/workflows/test_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index c3382773..5d49986b 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -53,7 +53,7 @@ jobs: - name: Run tests run: | - pytest -n 8 --dist loadgroup --reruns 2 --alluredir=allure-results + pytest -n 12 --dist loadgroup --reruns 2 --alluredir=allure-results - name: Get allure history if: always() From 9d1e1af6c6c5cba832c52f231e7c05e5260cd507 Mon Sep 17 00:00:00 2001 From: aya Date: Mon, 2 Dec 2024 12:25:38 +0200 Subject: [PATCH 03/12] Change number of threads to auto select --- .github/workflows/test_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index 5d49986b..f371b6e2 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -53,7 +53,7 @@ jobs: - name: Run tests run: | - pytest -n 12 --dist loadgroup --reruns 2 --alluredir=allure-results + pytest -n auto --dist loadgroup --reruns 2 --alluredir=allure-results - name: Get allure history if: always() From 0c4604aaf9e585db0d02bf13a24d090e65c6f468 Mon Sep 17 00:00:00 2001 From: aya Date: Mon, 2 Dec 2024 12:33:01 +0200 Subject: [PATCH 04/12] change number of threads to logical instead of auto --- .github/workflows/test_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index f371b6e2..eac0457e 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -53,7 +53,7 @@ jobs: - name: Run tests run: | - pytest -n auto --dist loadgroup --reruns 2 --alluredir=allure-results + pytest -n logical --dist loadgroup --reruns 2 --alluredir=allure-results - name: Get allure history if: always() From 236e3ca938951802537e1ef1a935f1b0f5858d55 Mon Sep 17 00:00:00 2001 From: aya Date: Mon, 2 Dec 2024 12:43:15 +0200 Subject: [PATCH 05/12] change number of threads to 150 --- .github/workflows/test_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index eac0457e..522bd680 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -53,7 +53,7 @@ jobs: - name: Run tests run: | - pytest -n logical --dist loadgroup --reruns 2 --alluredir=allure-results + pytest -n 150 --dist loadgroup --reruns 2 --alluredir=allure-results - name: Get allure history if: always() From 036e029dd6e728e2117e5161b3b00d7b4632efd1 Mon Sep 17 00:00:00 2001 From: aya Date: Mon, 2 Dec 2024 13:05:33 +0200 Subject: [PATCH 06/12] change total workers to 40 --- .github/workflows/test_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index 522bd680..d03633fb 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -53,7 +53,7 @@ jobs: - name: Run tests run: | - pytest -n 150 --dist loadgroup --reruns 2 --alluredir=allure-results + pytest -n 40 --dist loadgroup --reruns 2 --alluredir=allure-results - name: Get allure history if: always() From 804c78cd7440aa57fbec06fd5e164c7da620ab8d Mon Sep 17 00:00:00 2001 From: aya Date: Wed, 4 Dec 2024 11:32:20 +0200 Subject: [PATCH 07/12] Adding workflow_call in on section --- .github/workflows/nim_waku_daily.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nim_waku_daily.yml b/.github/workflows/nim_waku_daily.yml index 0154d9fc..01515eb1 100644 --- a/.github/workflows/nim_waku_daily.yml +++ b/.github/workflows/nim_waku_daily.yml @@ -8,6 +8,7 @@ on: schedule: - cron: '0 4 * * *' workflow_dispatch: + workflow_call: jobs: test-common: From 9580e59161f22e65b7cc12fcc35f5ad155fd46b3 Mon Sep 17 00:00:00 2001 From: aya Date: Wed, 4 Dec 2024 11:41:26 +0200 Subject: [PATCH 08/12] remove "remove_unwanted_software" from yml --- .github/workflows/test_common.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index d03633fb..53e25253 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -41,9 +41,6 @@ jobs: - uses: actions/checkout@v4 - - name: Remove unwanted software - uses: ./.github/actions/prune-vm - - uses: actions/setup-python@v4 with: python-version: '3.12' From 7d43de8d2f6ae0b7864f3345541365af0dbca240 Mon Sep 17 00:00:00 2001 From: aya Date: Wed, 4 Dec 2024 11:55:50 +0200 Subject: [PATCH 09/12] change path of requirements.txt --- .github/workflows/test_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index 53e25253..d55dc7bc 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -46,7 +46,7 @@ jobs: python-version: '3.12' cache: 'pip' - - run: pip install -r requirements.txt + - run: pip install -r wakuorg/waku-interop-tests/requirements.txt - name: Run tests run: | From e6792bf3b4b3ba90a0b8971a4bc7312ca461eca6 Mon Sep 17 00:00:00 2001 From: aya Date: Wed, 4 Dec 2024 12:00:03 +0200 Subject: [PATCH 10/12] modify path of .txt file again --- .github/workflows/test_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index d55dc7bc..0b7eb3ae 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -46,7 +46,7 @@ jobs: python-version: '3.12' cache: 'pip' - - run: pip install -r wakuorg/waku-interop-tests/requirements.txt + - run: pip install -r ${{ github.workspace }}/waku-interop-tests/requirements.txt - name: Run tests run: | From 8e80b15c1ce9a69825f1a5112b21ad504fc0f1b6 Mon Sep 17 00:00:00 2001 From: aya Date: Wed, 4 Dec 2024 13:43:32 +0200 Subject: [PATCH 11/12] Change repo name --- .github/workflows/test_common.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index 0b7eb3ae..196d0135 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -40,13 +40,16 @@ jobs: steps: - uses: actions/checkout@v4 + with: + repository: waku-org/waku-interop-tests - uses: actions/setup-python@v4 with: + python-version: '3.12' cache: 'pip' - - run: pip install -r ${{ github.workspace }}/waku-interop-tests/requirements.txt + - run: pip install -r requirements.txt - name: Run tests run: | From 3b049f7dad963d476f0b449ed0edfb35f2c6048b Mon Sep 17 00:00:00 2001 From: aya Date: Tue, 10 Dec 2024 13:07:52 +0200 Subject: [PATCH 12/12] Create docker volume --- src/node/docker_mananger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/docker_mananger.py b/src/node/docker_mananger.py index 44329d09..f077d282 100644 --- a/src/node/docker_mananger.py +++ b/src/node/docker_mananger.py @@ -46,7 +46,7 @@ class DockerManager: port_bindings = {f"{port}/tcp": ("", port) for port in ports} port_bindings_for_log = " ".join(f"-p {port}:{port}" for port in ports) cli_args_str_for_log = " ".join(cli_args) - logger.debug(f"docker run -i -t {port_bindings_for_log} {image_name} {cli_args_str_for_log}") + logger.debug(f"docker run -i -t -v temp_volum:/data {port_bindings_for_log} {image_name} {cli_args_str_for_log}") container = self._client.containers.run( image_name, command=cli_args, ports=port_bindings, detach=True, remove=remove_container, auto_remove=remove_container, volumes=volumes )