From 23d0db96d78cdc780c54de7dfc7b88bdbbbd9bcc Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Fri, 10 Jan 2025 14:06:16 +0100 Subject: [PATCH 1/5] CI: Set runners to ubuntu-24.04 instead of ubuntu-latest --- .github/workflows/ci-code.yml | 6 +++--- .github/workflows/docker-build-test.yml | 2 +- .github/workflows/docs-build.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- .github/workflows/test-install.yml | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-code.yml b/.github/workflows/ci-code.yml index 7ff4a9d864..2281c39f91 100644 --- a/.github/workflows/ci-code.yml +++ b/.github/workflows/ci-code.yml @@ -20,7 +20,7 @@ jobs: tests: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 45 strategy: @@ -93,7 +93,7 @@ jobs: tests-presto: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 20 steps: @@ -118,7 +118,7 @@ jobs: verdi: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 10 steps: diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 7c48b38493..64edd7bd56 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -26,7 +26,7 @@ jobs: build-and-test: if: ${{ github.event.pull_request.head.repo.fork }} name: build and test amd64 images - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 60 defaults: run: diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index a3b2b5e7aa..a380c91f85 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -14,7 +14,7 @@ jobs: docs-linkcheck: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index eb3001987b..066470c4b7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -27,7 +27,7 @@ jobs: nightly-tests: if: github.repository == 'aiidateam/aiida-core' # Prevent running the builds on forks as well - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 services: postgres: @@ -95,7 +95,7 @@ jobs: # Run a subset of test suite to ensure compatibility with latest RabbitMQ releases rabbitmq-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 10 strategy: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4951d1614..dd6806f521 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: # Only run this job on the main repository and not on forks if: github.repository == 'aiidateam/aiida-core' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -31,7 +31,7 @@ jobs: pre-commit: needs: [check-release-tag] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: @@ -50,7 +50,7 @@ jobs: tests: needs: [check-release-tag] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 30 services: @@ -75,7 +75,7 @@ jobs: needs: [check-release-tag, pre-commit, tests] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout source diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 148b1dbc8d..1ae3de6bd9 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -26,7 +26,7 @@ jobs: # Note: The specification is also validated by the pre-commit hook. if: github.repository == 'aiidateam/aiida-core' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 5 steps: @@ -56,7 +56,7 @@ jobs: needs: [validate-dependency-specification] if: github.repository == 'aiidateam/aiida-core' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 5 steps: @@ -76,7 +76,7 @@ jobs: install-with-pip: if: github.repository == 'aiidateam/aiida-core' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 15 strategy: @@ -107,7 +107,7 @@ jobs: # Verify that we can install AiiDA with conda. if: github.repository == 'aiidateam/aiida-core' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 25 strategy: @@ -159,7 +159,7 @@ jobs: tests: needs: [install-with-pip] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 45 strategy: From 0b87ff0734e19e94be89d694b8adba7dbe9faa2b Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Tue, 14 Jan 2025 19:31:05 +0000 Subject: [PATCH 2/5] Add debug print to test_containerized_code.py --- .github/system_tests/test_containerized_code.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/system_tests/test_containerized_code.py b/.github/system_tests/test_containerized_code.py index a4286d8ba7..d7f57690f1 100644 --- a/.github/system_tests/test_containerized_code.py +++ b/.github/system_tests/test_containerized_code.py @@ -19,8 +19,11 @@ def test_add_singularity(): builder.y = orm.Int(6) builder.metadata.options.resources = {'num_machines': 1, 'num_mpiprocs_per_machine': 1} + print('Running containerized code') results, node = run_get_node(builder) + print(f'{results=}') + print(f'{node=}') assert node.is_finished_ok assert 'sum' in results assert 'remote_folder' in results From b878b79c0f011b9ad576403e850c41ae35ff5f2c Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Tue, 14 Jan 2025 19:31:29 +0000 Subject: [PATCH 3/5] Remove unneeded venv activation --- .github/workflows/nightly.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 066470c4b7..47a10ae288 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -70,12 +70,11 @@ jobs: from-lock: 'true' - name: Setup environment - # NOTE: virtual env in .venv created by uv in previous step - run: source .venv/bin/activate && .github/workflows/setup.sh + run: .github/workflows/setup.sh - name: Run tests id: tests - run: source .venv/bin/activate && .github/workflows/tests_nightly.sh + run: .github/workflows/tests_nightly.sh - name: Slack notification # Always run this step (otherwise it would be skipped if any of the previous steps fail) but only if the From 7c6f7379607b4037045dc87a7bb6aa88b7842df6 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Wed, 15 Jan 2025 15:02:00 +0000 Subject: [PATCH 4/5] Pin nightly job on ubuntu 22.04 --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 47a10ae288..4f1fc0750f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -27,7 +27,7 @@ jobs: nightly-tests: if: github.repository == 'aiidateam/aiida-core' # Prevent running the builds on forks as well - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 services: postgres: From 9822340612107156a8383860f3c50c979a4d1176 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Wed, 15 Jan 2025 15:02:14 +0000 Subject: [PATCH 5/5] Revert "Add debug print to test_containerized_code.py" This reverts commit 0b87ff0734e19e94be89d694b8adba7dbe9faa2b. --- .github/system_tests/test_containerized_code.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/system_tests/test_containerized_code.py b/.github/system_tests/test_containerized_code.py index d7f57690f1..a4286d8ba7 100644 --- a/.github/system_tests/test_containerized_code.py +++ b/.github/system_tests/test_containerized_code.py @@ -19,11 +19,8 @@ def test_add_singularity(): builder.y = orm.Int(6) builder.metadata.options.resources = {'num_machines': 1, 'num_mpiprocs_per_machine': 1} - print('Running containerized code') results, node = run_get_node(builder) - print(f'{results=}') - print(f'{node=}') assert node.is_finished_ok assert 'sum' in results assert 'remote_folder' in results