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 }} 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 diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index f9a2087c8..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-241118-0918-4538c6df", - "RL9": "openhpc-RL9-241118-0918-4538c6df" + "RL8": "openhpc-RL8-241127-1704-6a8266c3", + "RL9": "openhpc-RL9-241127-1704-6a8266c3" } } 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" 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