Skip to content

Commit 4538c6d

Browse files
wtripp180901wtripp180901
committed
merge
2 parents 5b43d0e + 969c6f2 commit 4538c6d

File tree

9 files changed

+24
-50
lines changed

9 files changed

+24
-50
lines changed

‎.github/workflows/fatimage.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,23 @@ jobs:
2020
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: false # allow other matrix jobs to continue even if one fails
23-
matrix: # build RL8+OFED, RL9+OFED, RL9+OFED+CUDA versions
23+
matrix: # build RL8, RL9
2424
os_version:
2525
- RL8
2626
- RL9
2727
build:
2828
- openstack.openhpc
29-
- openstack.openhpc-cuda
30-
exclude:
31-
- os_version: RL8
32-
build: openstack.openhpc-cuda
3329
env:
3430
ANSIBLE_FORCE_COLOR: True
3531
OS_CLOUD: openstack
3632
CI_CLOUD: ${{ github.event.inputs.ci_cloud }}
3733
SOURCE_IMAGES_MAP: |
3834
{
3935
"RL8": {
40-
"openstack.openhpc": "rocky-latest-RL8",
41-
"openstack.openhpc-cuda": "rocky-latest-cuda-RL8"
36+
"openstack.openhpc": "rocky-latest-RL8"
4237
},
4338
"RL9": {
44-
"openstack.openhpc": "rocky-latest-RL9",
45-
"openstack.openhpc-cuda": "rocky-latest-cuda-RL9"
39+
"openstack.openhpc": "rocky-latest-RL9"
4640
}
4741
}
4842

‎.github/workflows/nightlybuild.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,12 @@ jobs:
2222
runs-on: ubuntu-22.04
2323
strategy:
2424
fail-fast: false # allow other matrix jobs to continue even if one fails
25-
matrix: # build RL8, RL9, RL9+CUDA versions
25+
matrix: # build RL8, RL9
2626
os_version:
2727
- RL8
2828
- RL9
2929
build:
3030
- openstack.rocky-latest
31-
- openstack.rocky-latest-cuda
32-
exclude:
33-
- os_version: RL8
34-
build: openstack.rocky-latest-cuda
35-
3631
env:
3732
ANSIBLE_FORCE_COLOR: True
3833
OS_CLOUD: openstack
@@ -108,6 +103,11 @@ jobs:
108103
echo "image-name=${IMAGE_NAME}" >> "$GITHUB_OUTPUT"
109104
echo "image-id=$IMAGE_ID" >> "$GITHUB_OUTPUT"
110105
106+
- name: Make image usable for further builds
107+
run: |
108+
. venv/bin/activate
109+
openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}"
110+
111111
- name: Delete old latest image
112112
run: |
113113
. venv/bin/activate
@@ -139,10 +139,7 @@ jobs:
139139
- RL9
140140
image:
141141
- rocky-latest
142-
- rocky-latest-cuda
143142
exclude:
144-
- os_version: RL8
145-
image: rocky-latest-cuda
146143
- target_cloud: LEAFCLOUD
147144
env:
148145
OS_CLOUD: openstack

‎.github/workflows/s3-image-sync.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
build:
4343
- RL8
4444
- RL9
45-
- RL9-cuda
4645
env:
4746
ANSIBLE_FORCE_COLOR: True
4847
OS_CLOUD: openstack
@@ -112,7 +111,6 @@ jobs:
112111
build:
113112
- RL8
114113
- RL9
115-
- RL9-cuda
116114
exclude:
117115
- cloud: ${{ needs.image_upload.outputs.ci_cloud }}
118116

‎.github/workflows/trivyscan.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ on:
1010
jobs:
1111
scan:
1212
concurrency:
13-
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.build }} # to branch/PR + OS + build
13+
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.build }} # to branch/PR + build
1414
cancel-in-progress: true
1515
runs-on: ubuntu-latest
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
build: ["RL8", "RL9", "RL9-cuda"]
19+
build: ["RL8", "RL9"]
2020
env:
2121
JSON_PATH: environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
2222
OS_CLOUD: openstack
@@ -94,12 +94,13 @@ jobs:
9494
timeout: 15m
9595
env:
9696
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
97+
TRIVY_DB_REPOSITORY: ghcr.io/azimuth-cloud/trivy-db:2
9798

9899
- name: Upload Trivy scan results to GitHub Security tab
99100
uses: github/codeql-action/upload-sarif@v3
100101
with:
101102
sarif_file: "${{ steps.manifest.outputs.image-name }}.sarif"
102-
category: "${{ matrix.os_version }}-${{ matrix.build }}"
103+
category: "${{ matrix.build }}"
103104

104105
- name: Fail if scan has CRITICAL vulnerabilities
105106
uses: aquasecurity/[email protected]
@@ -114,3 +115,4 @@ jobs:
114115
timeout: 15m
115116
env:
116117
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118+
TRIVY_DB_REPOSITORY: ghcr.io/azimuth-cloud/trivy-db:2

‎environments/.stackhpc/hooks/post.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
path: "{{ item }}"
1010
state: absent
1111
with_items:
12-
- /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.7-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock
13-
- /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.9-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock
14-
- /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.7-1/gems/bootstrap_form-4.5.0/demo/yarn.lock
15-
- /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.9-1/gems/bootstrap_form-4.5.0/demo/yarn.lock
12+
- "/opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock"
13+
- "/opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-4.5.0/demo/yarn.lock"
1614
- /var/www/ood/apps/sys/dashboard/node_modules/data-confirm-modal/Gemfile.lock

‎environments/.stackhpc/inventory/group_vars/openondemand/overrides.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ openondemand_desktop_partition: standard
44
#openondemand_dashboard_support_url:
55
#openondemand_dashboard_docs_url:
66
#openondemand_filesapp_paths:
7+
ondemand_package: ondemand-"{{ ondemand_package_version }}"
8+
ondemand_package_version: '3.1.10'

‎environments/.stackhpc/terraform/cluster_image.auto.tfvars.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"cluster_image": {
3-
"RL8": "openhpc-RL8-241113-0934-20a8a626",
4-
"RL9": "openhpc-RL9-241113-0934-20a8a626",
5-
"RL9-cuda": "openhpc-cuda-RL9-241113-0934-20a8a626"
3+
"RL8": "openhpc-RL8-241115-1209-097cdae1",
4+
"RL9": "openhpc-RL9-241115-1209-097cdae1"
65
}
76
}

‎packer/openstack.pkr.hcl

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,13 @@ variable "volume_size" {
127127
default = {
128128
# fat image builds, GB:
129129
rocky-latest = 15
130-
rocky-latest-cuda = 30
131130
openhpc = 15
132-
openhpc-cuda = 30
133131
}
134132
}
135133

136134
variable "extra_build_volume_size" {
137135
type = number
138-
default = 15 # same as default non-CUDA build
136+
default = 15
139137
}
140138

141139
variable "image_disk_format" {
@@ -153,10 +151,8 @@ variable "groups" {
153151
description = "Additional inventory groups (other than 'builder') to add build VM to, keyed by source name"
154152
default = {
155153
# fat image builds:
156-
rocky-latest = ["update", "ofed"]
157-
rocky-latest-cuda = ["update", "ofed", "cuda"]
154+
rocky-latest = ["update"]
158155
openhpc = ["control", "compute", "login"]
159-
openhpc-cuda = ["control", "compute", "login"]
160156
}
161157
}
162158

@@ -210,24 +206,12 @@ build {
210206
image_name = "${source.name}-${var.os_version}"
211207
}
212208

213-
# latest nightly cuda image:
214-
source "source.openstack.openhpc" {
215-
name = "rocky-latest-cuda"
216-
image_name = "${source.name}-${var.os_version}"
217-
}
218-
219-
# OFED fat image:
209+
# fat image:
220210
source "source.openstack.openhpc" {
221211
name = "openhpc"
222212
image_name = "${source.name}-${var.os_version}-${local.timestamp}-${substr(local.git_commit, 0, 8)}"
223213
}
224214

225-
# CUDA fat image:
226-
source "source.openstack.openhpc" {
227-
name = "openhpc-cuda"
228-
image_name = "${source.name}-${var.os_version}-${local.timestamp}-${substr(local.git_commit, 0, 8)}"
229-
}
230-
231215
# Extended site-specific image, built on fat image:
232216
source "source.openstack.openhpc" {
233217
name = "openhpc-extra"

‎requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ roles:
2121
version: v3.1.5
2222
- src: https://github.com/stackhpc/ansible-role-os-manila-mount.git
2323
name: stackhpc.os-manila-mount
24-
version: v24.5.1 # Support ceph quincy for RL9
24+
version: v24.11.0 # Support ceph quincy for RL9
2525

2626
collections:
2727
- name: containers.podman

0 commit comments

Comments
 (0)