Skip to content

Commit

Permalink
Merge pull request #3393 from Cray-HPE/CASMINST-5905
Browse files Browse the repository at this point in the history
CAMINST-5905
  • Loading branch information
mtupitsyn authored May 15, 2024
2 parents 4f0bef7 + ee47d7c commit 47d4b85
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,29 @@ KERNEL_VERSION='5.14.21-150500.55.52-default'
KERNEL_DEFAULT_DEBUGINFO_VERSION="${KERNEL_VERSION//-default/}.1"

# The image ID may not always match the other images and should be defined individually.
KUBERNETES_IMAGE_ID=6.1.80
KUBERNETES_IMAGE_ID=6.1.83
KUBERNETES_ASSETS=(
"https://artifactory.algol60.net/artifactory/csm-images/stable/kubernetes/${KUBERNETES_IMAGE_ID}/kubernetes-${KUBERNETES_IMAGE_ID}-${NCN_ARCH}.squashfs"
"https://artifactory.algol60.net/artifactory/csm-images/stable/kubernetes/${KUBERNETES_IMAGE_ID}/${KERNEL_VERSION}-${KUBERNETES_IMAGE_ID}-${NCN_ARCH}.kernel"
"https://artifactory.algol60.net/artifactory/csm-images/stable/kubernetes/${KUBERNETES_IMAGE_ID}/initrd.img-${KUBERNETES_IMAGE_ID}-${NCN_ARCH}.xz"
)

# The image ID may not always match the other images and should be defined individually.
PIT_IMAGE_ID=6.1.80
PIT_IMAGE_ID=6.1.83
PIT_ASSETS=(
"https://artifactory.algol60.net/artifactory/csm-images/stable/pre-install-toolkit/${PIT_IMAGE_ID}/pre-install-toolkit-${PIT_IMAGE_ID}-${NCN_ARCH}.iso"
)

# The image ID may not always match the other images and should be defined individually.
STORAGE_CEPH_IMAGE_ID=6.1.80
STORAGE_CEPH_IMAGE_ID=6.1.83
STORAGE_CEPH_ASSETS=(
"https://artifactory.algol60.net/artifactory/csm-images/stable/storage-ceph/${STORAGE_CEPH_IMAGE_ID}/storage-ceph-${STORAGE_CEPH_IMAGE_ID}-${NCN_ARCH}.squashfs"
"https://artifactory.algol60.net/artifactory/csm-images/stable/storage-ceph/${STORAGE_CEPH_IMAGE_ID}/${KERNEL_VERSION}-${STORAGE_CEPH_IMAGE_ID}-${NCN_ARCH}.kernel"
"https://artifactory.algol60.net/artifactory/csm-images/stable/storage-ceph/${STORAGE_CEPH_IMAGE_ID}/initrd.img-${STORAGE_CEPH_IMAGE_ID}-${NCN_ARCH}.xz"
)

# The image ID may not always match the other images and should be defined individually.
COMPUTE_IMAGE_ID=6.1.80
COMPUTE_IMAGE_ID=6.1.83
for arch in "${CN_ARCH[@]}"; do
eval "COMPUTE_${arch}_ASSETS"=\( \
"https://artifactory.algol60.net/artifactory/csm-images/stable/compute/${COMPUTE_IMAGE_ID}/compute-${COMPUTE_IMAGE_ID}-${arch}.squashfs" \
Expand Down
2 changes: 1 addition & 1 deletion rpm/cray/csm/noos/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/noos/:
- cfs-state-reporter-1.11.0-1.noarch
- cfs-trust-1.7.0-1.noarch
- cray-cmstools-crayctldeploy-1.21.0-1.x86_64
- cray-site-init-1.32.7-1.x86_64
- cray-site-init-1.32.8-1.x86_64
- cray-uai-util-2.2.1-1.noarch
- cray-node-exporter-1.5.0.1-1.noarch
- craycli-0.83.3-1.aarch64
Expand Down

0 comments on commit 47d4b85

Please sign in to comment.