Skip to content

Commit cda5d97

Browse files
committed
Merge remote-tracking branch 'origin/main' into production-end-to-end-deployment-docs
2 parents bfe3cdc + 98ed51b commit cda5d97

File tree

151 files changed

+2354
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+2354
-353
lines changed

.github/bin/get-s3-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [ -n "$image_exists" ]; then
1717
else
1818
echo "Image $image_name not found in OpenStack. Getting it from S3."
1919

20-
wget https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/$bucket_name/$image_name --progress=dot:giga
20+
wget https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/$bucket_name/$image_name --progress=dot:giga
2121

2222
echo "Uploading image $image_name to OpenStack..."
2323
openstack image create --file $image_name --disk-format qcow2 $image_name --progress

.github/workflows/extra.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
99
- 'ansible/roles/doca/**'
1010
- 'ansible/roles/cuda/**'
11+
- 'ansible/roles/slurm_recompile/**' # runs on cuda group
1112
- 'ansible/roles/lustre/**'
1213
- '.github/workflows/extra.yml'
1314
pull_request:
@@ -32,16 +33,17 @@ jobs:
3233
- image_name: openhpc-extra-RL8
3334
source_image_name_key: RL8 # key into environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
3435
inventory_groups: doca,cuda,lustre
35-
volume_size: 30 # needed for cuda
36+
volume_size: 35 # needed for cuda
3637
- image_name: openhpc-extra-RL9
3738
source_image_name_key: RL9
3839
inventory_groups: doca,cuda,lustre
39-
volume_size: 30 # needed for cuda
40+
volume_size: 35 # needed for cuda
4041
env:
4142
ANSIBLE_FORCE_COLOR: True
4243
OS_CLOUD: openstack
4344
CI_CLOUD: ${{ vars.CI_CLOUD }} # default from repo settings
4445
ARK_PASSWORD: ${{ secrets.ARK_PASSWORD }}
46+
PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4547

4648
steps:
4749
- uses: actions/checkout@v2
@@ -94,7 +96,7 @@ jobs:
9496
. environments/.stackhpc/activate
9597
cd packer/
9698
packer init .
97-
99+
98100
PACKER_LOG=1 packer build \
99101
-on-error=${{ vars.PACKER_ON_ERROR }} \
100102
-var-file=$PKR_VAR_environment_root/${{ env.CI_CLOUD }}.pkrvars.hcl \
@@ -103,7 +105,7 @@ jobs:
103105
-var "inventory_groups=${{ matrix.build.inventory_groups }}" \
104106
-var "volume_size=${{ matrix.build.volume_size }}" \
105107
openstack.pkr.hcl
106-
108+
107109
- name: Get created image names from manifest
108110
id: manifest
109111
run: |

.github/workflows/fatimage.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ jobs:
3131
source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.raw
3232
inventory_groups: control,compute,login,update
3333
- image_name: openhpc-RL9
34-
source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.raw
34+
source_image_name: Rocky-9-GenericCloud-Base-9.6-20250531.0.x86_64.qcow2
3535
inventory_groups: control,compute,login,update
3636
env:
3737
ANSIBLE_FORCE_COLOR: True
3838
OS_CLOUD: openstack
3939
CI_CLOUD: ${{ github.event.inputs.ci_cloud }}
4040
ARK_PASSWORD: ${{ secrets.ARK_PASSWORD }}
4141
LEAFCLOUD_PULP_PASSWORD: ${{ secrets.LEAFCLOUD_PULP_PASSWORD }}
42+
PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4243

4344
steps:
4445
- uses: actions/checkout@v2

.github/workflows/nightlybuild.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
CI_CLOUD: ${{ github.event.inputs.ci_cloud || vars.CI_CLOUD }}
3737
ARK_PASSWORD: ${{ secrets.ARK_PASSWORD }}
3838
LEAFCLOUD_PULP_PASSWORD: ${{ secrets.LEAFCLOUD_PULP_PASSWORD }}
39+
PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3940

4041
steps:
4142
- uses: actions/checkout@v2

.github/workflows/release-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v2
2222

2323
- name: Write s3cmd configuration
24-
run: echo "${{ secrets.ARCUS_S3_CFG }}" > ~/.s3cfg
24+
run: echo "${{ secrets.LEAFCLOUD_S3_CFG }}" > ~/.s3cfg
2525

2626
- name: Install s3cmd
2727
run: |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Upload CI-tested images to Arcus S3 and sync clouds
1+
name: Upload CI-tested images to Leafcloud S3 and sync clouds
22
on:
33
workflow_dispatch:
44
push:
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Write s3cmd configuration
2323
run: |
24-
echo "${{ secrets['ARCUS_S3_CFG'] }}" > ~/.s3cfg
24+
echo "${{ secrets['LEAFCLOUD_S3_CFG'] }}" > ~/.s3cfg
2525
shell: bash
2626

2727
- name: Install s3cmd
@@ -73,7 +73,7 @@ jobs:
7373

7474
- name: Write s3cmd configuration
7575
run: |
76-
echo "${{ secrets['ARCUS_S3_CFG'] }}" > ~/.s3cfg
76+
echo "${{ secrets['LEAFCLOUD_S3_CFG'] }}" > ~/.s3cfg
7777
shell: bash
7878

7979
- name: Install s3cmd and qemu-utils

.github/workflows/stackhpc.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ on:
99
- '**'
1010
- '!dev/**'
1111
- 'dev/setup-env.sh'
12-
- '!docs/**'
13-
- '!README.md'
12+
- '!**.md'
1413
- '!.gitignore'
1514
- '!.github/workflows/'
1615
- '.github/workflows/stackhpc'
@@ -19,8 +18,7 @@ on:
1918
- '**'
2019
- '!dev/**'
2120
- 'dev/setup-env.sh'
22-
- '!docs/**'
23-
- '!README.md'
21+
- '!**.md'
2422
- '!.gitignore'
2523
- '!.github/workflows/'
2624
- '.github/workflows/stackhpc'

.github/workflows/upload-release-image.yml.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
inputs:
2020
image_name:
2121
type: string
22-
description: Image name from: (https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/{BUCKET_NAME})
22+
description: Image name from: (https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/{BUCKET_NAME})
2323
required: true
2424
bucket_name:
2525
type: choice

LICENSE

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Run the following from the repository root to activate the venv:
6161
Use the `cookiecutter` template to create a new environment to hold your configuration:
6262

6363
cd environments
64-
cookiecutter skeleton
64+
cookiecutter ../cookiecutter
6565

6666
and follow the prompts to complete the environment name and description.
6767

0 commit comments

Comments
 (0)