From 3e80268714e8a50c9d78a773e02f12daeac6240f Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 25 Nov 2024 12:17:16 +0000 Subject: [PATCH 01/13] set up rocky-latest-test builds and ci --- .github/workflows/fatimage.yml | 4 ++-- .github/workflows/nightlybuild.yml | 4 ++-- packer/openstack.pkr.hcl | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index a8d3dbe29..d40504168 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -33,10 +33,10 @@ jobs: SOURCE_IMAGES_MAP: | { "RL8": { - "openstack.openhpc": "rocky-latest-RL8" + "openstack.openhpc": "rocky-latest-test-RL8" }, "RL9": { - "openstack.openhpc": "rocky-latest-RL9" + "openstack.openhpc": "rocky-latest-test-RL9" } } diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml index da3de4ea5..66cbe8ba7 100644 --- a/.github/workflows/nightlybuild.yml +++ b/.github/workflows/nightlybuild.yml @@ -27,7 +27,7 @@ jobs: - RL8 - RL9 build: - - openstack.rocky-latest + - openstack.rocky-latest-test env: ANSIBLE_FORCE_COLOR: True OS_CLOUD: openstack @@ -138,7 +138,7 @@ jobs: - RL8 - RL9 image: - - rocky-latest + - rocky-latest-test exclude: - target_cloud: LEAFCLOUD env: diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl index 52202ead1..6fb1ff633 100644 --- a/packer/openstack.pkr.hcl +++ b/packer/openstack.pkr.hcl @@ -127,6 +127,7 @@ variable "volume_size" { default = { # fat image builds, GB: rocky-latest = 15 + rocky-latest-test = 15 openhpc = 15 } } @@ -152,6 +153,7 @@ variable "groups" { default = { # fat image builds: rocky-latest = ["update"] + rocky-latest-test = ["update"] openhpc = ["control", "compute", "login"] } } @@ -206,6 +208,12 @@ build { image_name = "${source.name}-${var.os_version}" } + # latest nightly image test: + source "source.openstack.openhpc" { + name = "rocky-latest-test" + image_name = "${source.name}-${var.os_version}" + } + # fat image: source "source.openstack.openhpc" { name = "openhpc" From 151746cad8d4d3abad63eab9df712392b2968e88 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 25 Nov 2024 13:25:32 +0000 Subject: [PATCH 02/13] bump images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index f9a2087c8..71a9162f8 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241118-0918-4538c6df", - "RL9": "openhpc-RL9-241118-0918-4538c6df" + "RL8": "openhpc-RL8-241125-1232-3e802687", + "RL9": "openhpc-RL9-241125-1232-3e802687" } } From 9c3301c28ebdccc8bb5574b50c12de7e75ef971a Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 25 Nov 2024 13:28:26 +0000 Subject: [PATCH 03/13] CI_CLOUD PR label override for trivy scan --- .github/workflows/trivyscan.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/trivyscan.yml b/.github/workflows/trivyscan.yml index 4c090b85a..5b65baca1 100644 --- a/.github/workflows/trivyscan.yml +++ b/.github/workflows/trivyscan.yml @@ -25,6 +25,20 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Override CI_CLOUD if PR label is present + if: ${{ github.event_name == 'pull_request' }} + run: | + # Iterate over the labels + labels=$(echo '${{ toJSON(github.event.pull_request.labels) }}' | jq -r '.[].name') + echo $labels + for label in $labels; do + if [[ $label == CI_CLOUD=* ]]; then + # Extract the value after 'CI_CLOUD=' + CI_CLOUD_OVERRIDE=${label#CI_CLOUD=} + echo "CI_CLOUD=${CI_CLOUD_OVERRIDE}" >> $GITHUB_ENV + fi + done + - name: Record settings for CI cloud run: | echo CI_CLOUD: ${{ env.CI_CLOUD }} From b2b21603b4246266a72f6d7b304a1ca086eaa762 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 25 Nov 2024 14:19:33 +0000 Subject: [PATCH 04/13] bump images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 71a9162f8..70422736e 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241125-1232-3e802687", - "RL9": "openhpc-RL9-241125-1232-3e802687" + "RL8": "openhpc-RL8-241125-1349-9c3301c2", + "RL9": "openhpc-RL9-241125-1349-9c3301c2" } } From 0da074ba5b52fd0dfb63e824f88743f6e53bf562 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 25 Nov 2024 15:31:55 +0000 Subject: [PATCH 05/13] bump containers.podman collection version --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 3d8c44011..142f377e5 100644 --- a/requirements.yml +++ b/requirements.yml @@ -25,7 +25,7 @@ roles: collections: - name: containers.podman - version: 1.10.2 + version: 1.16.2 - name: community.grafana version: 1.5.4 - name: https://github.com/stackhpc/ansible_collection_slurm_openstack_tools From 5ae1888fd7a70559c7b6575368adefaa25e6ddbc Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 25 Nov 2024 22:30:00 +0000 Subject: [PATCH 06/13] bump images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 70422736e..a4b65df6e 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241125-1349-9c3301c2", - "RL9": "openhpc-RL9-241125-1349-9c3301c2" + "RL8": "openhpc-RL8-241125-1804-0da074ba", + "RL9": "openhpc-RL9-241125-1804-0da074ba" } } From b4d2d19d22fa6fb18c34bf4b1551ef4eae38569b Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Tue, 26 Nov 2024 09:57:57 +0000 Subject: [PATCH 07/13] debug site.yml --- .github/workflows/stackhpc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stackhpc.yml b/.github/workflows/stackhpc.yml index b08854adb..17b142713 100644 --- a/.github/workflows/stackhpc.yml +++ b/.github/workflows/stackhpc.yml @@ -124,7 +124,7 @@ jobs: . venv/bin/activate . environments/.stackhpc/activate ansible all -m wait_for_connection - ansible-playbook -v ansible/site.yml + ansible-playbook -vvv ansible/site.yml ansible-playbook -v ansible/ci/check_slurm.yml - name: Run MPI-based tests From 88e23de80019c30513b358b6c6d80bbd6c8b5acf Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Tue, 26 Nov 2024 10:21:37 +0000 Subject: [PATCH 08/13] mysql latest From 6671d69c44de8dc7d5cc1ed15ad4b136eed58215 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Tue, 26 Nov 2024 12:00:52 +0000 Subject: [PATCH 09/13] bump mysql From 6a8266c37c0aa5e6c321eabbcd539927d12e599f Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 27 Nov 2024 16:37:32 +0000 Subject: [PATCH 10/13] clear podman temp files on startup --- ansible/roles/podman/tasks/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/podman/tasks/config.yml b/ansible/roles/podman/tasks/config.yml index 5fea3c2e0..74cf1d576 100644 --- a/ansible/roles/podman/tasks/config.yml +++ b/ansible/roles/podman/tasks/config.yml @@ -55,6 +55,7 @@ # Type Path Mode User Group Age Argument R! /tmp/containers-user-* R! /tmp/podman-run-* + R! /tmp/storage-run-* dest: /etc/tmpfiles.d/podman-local.conf owner: root group: root From 33ffa655daafe55bf7d613664fdf8547716d94a2 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 27 Nov 2024 20:13:35 +0000 Subject: [PATCH 11/13] bump new images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index a4b65df6e..830a96499 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241125-1804-0da074ba", - "RL9": "openhpc-RL9-241125-1804-0da074ba" + "RL8": "openhpc-RL8-241127-1704-6a8266c3", + "RL9": "openhpc-RL9-241127-1704-6a8266c3" } } From f4c5cfe639b7b6145bea5f796cf2b9fdc7d96718 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 28 Nov 2024 10:52:22 +0000 Subject: [PATCH 12/13] stop using rocky-latest-test images in CI --- .github/workflows/fatimage.yml | 4 ++-- .github/workflows/nightlybuild.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index d40504168..a8d3dbe29 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -33,10 +33,10 @@ jobs: SOURCE_IMAGES_MAP: | { "RL8": { - "openstack.openhpc": "rocky-latest-test-RL8" + "openstack.openhpc": "rocky-latest-RL8" }, "RL9": { - "openstack.openhpc": "rocky-latest-test-RL9" + "openstack.openhpc": "rocky-latest-RL9" } } diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml index 66cbe8ba7..da3de4ea5 100644 --- a/.github/workflows/nightlybuild.yml +++ b/.github/workflows/nightlybuild.yml @@ -27,7 +27,7 @@ jobs: - RL8 - RL9 build: - - openstack.rocky-latest-test + - openstack.rocky-latest env: ANSIBLE_FORCE_COLOR: True OS_CLOUD: openstack @@ -138,7 +138,7 @@ jobs: - RL8 - RL9 image: - - rocky-latest-test + - rocky-latest exclude: - target_cloud: LEAFCLOUD env: From d7a8dd20110abaf759a1bc0bea3d706282e2d242 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 28 Nov 2024 10:54:34 +0000 Subject: [PATCH 13/13] low verbosity CI site.yml --- .github/workflows/stackhpc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stackhpc.yml b/.github/workflows/stackhpc.yml index 17b142713..b08854adb 100644 --- a/.github/workflows/stackhpc.yml +++ b/.github/workflows/stackhpc.yml @@ -124,7 +124,7 @@ jobs: . venv/bin/activate . environments/.stackhpc/activate ansible all -m wait_for_connection - ansible-playbook -vvv ansible/site.yml + ansible-playbook -v ansible/site.yml ansible-playbook -v ansible/ci/check_slurm.yml - name: Run MPI-based tests