From 403d729bdd6e9d74ac9d53199b67a2fa6e38a674 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Wed, 13 Nov 2024 14:09:03 +0000 Subject: [PATCH 1/7] bumped os-manilla-mount to test branch --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index cd8197beb..a9f299aa1 100644 --- a/requirements.yml +++ b/requirements.yml @@ -21,7 +21,7 @@ roles: version: v3.1.5 - src: https://github.com/stackhpc/ansible-role-os-manila-mount.git name: stackhpc.os-manila-mount - version: v24.5.1 # Support ceph quincy for RL9 + version: fix/rl8-ceph # Bump when merges # Support ceph quincy for RL9 collections: - name: containers.podman From 5d33ab5508b0cc44743552a4f33916a4b1e8f40f Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:30:18 +0000 Subject: [PATCH 2/7] bump images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 9f396e964..9af46c31d 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,7 +1,7 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241024-1439-177083b1", - "RL9": "openhpc-RL9-241024-1438-177083b1", - "RL9-cuda": "openhpc-cuda-RL9-241024-1628-177083b1" + "RL8": "openhpc-RL8-241113-1501-403d729b", + "RL9": "openhpc-RL9-241113-1416-403d729b", + "RL9-cuda": "openhpc-cuda-RL9-241113-1416-403d729b" } -} \ No newline at end of file +} From 0b7637355c22eeb32b643916f6634014e9e12d64 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Wed, 13 Nov 2024 16:00:13 +0000 Subject: [PATCH 3/7] bumped role to new release --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index a9f299aa1..3d8c44011 100644 --- a/requirements.yml +++ b/requirements.yml @@ -21,7 +21,7 @@ roles: version: v3.1.5 - src: https://github.com/stackhpc/ansible-role-os-manila-mount.git name: stackhpc.os-manila-mount - version: fix/rl8-ceph # Bump when merges # Support ceph quincy for RL9 + version: v24.11.0 # Support ceph quincy for RL9 collections: - name: containers.podman From 6af7c5b475895000fadc1c94a73aa7f49aef6501 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:15:09 +0000 Subject: [PATCH 4/7] trivy now uses mirrored db --- .github/workflows/trivyscan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/trivyscan.yml b/.github/workflows/trivyscan.yml index 2957b22ee..2c0d1f80b 100644 --- a/.github/workflows/trivyscan.yml +++ b/.github/workflows/trivyscan.yml @@ -114,3 +114,4 @@ jobs: timeout: 15m env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TRIVY_DB_REPOSITORY: ghcr.io/azimuth-cloud/trivy-db:2 From 6f0a3a029740054420c12148e4c3f7e245000ff2 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Thu, 14 Nov 2024 11:46:59 +0000 Subject: [PATCH 5/7] pinned ood fatimage version --- environments/.stackhpc/hooks/post.yml | 6 ++---- .../inventory/group_vars/openondemand/overrides.yml | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environments/.stackhpc/hooks/post.yml b/environments/.stackhpc/hooks/post.yml index 5032f0ecc..bd60015d9 100644 --- a/environments/.stackhpc/hooks/post.yml +++ b/environments/.stackhpc/hooks/post.yml @@ -9,8 +9,6 @@ path: "{{ item }}" state: absent with_items: - - /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.7-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock - - /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.9-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock - - /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.7-1/gems/bootstrap_form-4.5.0/demo/yarn.lock - - /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.9-1/gems/bootstrap_form-4.5.0/demo/yarn.lock + - "/opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock" + - "/opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-4.5.0/demo/yarn.lock" - /var/www/ood/apps/sys/dashboard/node_modules/data-confirm-modal/Gemfile.lock \ No newline at end of file diff --git a/environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml b/environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml index 735da25df..72b6cf476 100644 --- a/environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml +++ b/environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml @@ -4,3 +4,5 @@ openondemand_desktop_partition: standard #openondemand_dashboard_support_url: #openondemand_dashboard_docs_url: #openondemand_filesapp_paths: +ondemand_package: ondemand-"{{ ondemand_package_version }}" +ondemand_package_version: '3.1.10' From 169414b18126b2dbfee1fd75179006fc304b4610 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:08:38 +0000 Subject: [PATCH 6/7] bump images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 9af46c31d..cca779082 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,7 +1,7 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241113-1501-403d729b", - "RL9": "openhpc-RL9-241113-1416-403d729b", - "RL9-cuda": "openhpc-cuda-RL9-241113-1416-403d729b" + "RL8": "openhpc-RL8-241114-1531-6f0a3a02", + "RL9": "openhpc-RL9-241114-1531-6f0a3a02", + "RL9-cuda": "openhpc-cuda-RL9-241114-1531-6f0a3a02" } } From c5ab6c8e05883b99851b1f441db663b57d019c84 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:23:37 +0000 Subject: [PATCH 7/7] fixed trivy ratelimiting --- .github/workflows/trivyscan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/trivyscan.yml b/.github/workflows/trivyscan.yml index 2c0d1f80b..d1c789a19 100644 --- a/.github/workflows/trivyscan.yml +++ b/.github/workflows/trivyscan.yml @@ -94,6 +94,7 @@ jobs: timeout: 15m env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TRIVY_DB_REPOSITORY: ghcr.io/azimuth-cloud/trivy-db:2 - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v3