Skip to content

Commit

Permalink
Merge pull request #3513 from Cray-HPE/CASMTRIAGE-7093_MTL-2418
Browse files Browse the repository at this point in the history
  • Loading branch information
mtupitsyn authored Jul 11, 2024
2 parents 3c2558c + 6fe89b2 commit d874078
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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.65-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.91
KUBERNETES_IMAGE_ID=6.1.92
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.91
PIT_IMAGE_ID=6.1.92
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.91
STORAGE_CEPH_IMAGE_ID=6.1.92
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.91
COMPUTE_IMAGE_ID=6.1.92
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
4 changes: 2 additions & 2 deletions 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.1-1.noarch
- cray-cmstools-crayctldeploy-1.22.0-1.x86_64
- cray-site-init-1.33.3-1.x86_64
- cray-site-init-1.34.0-1.x86_64
- cray-uai-util-2.2.1-1.noarch
- cray-node-exporter-1.5.0.1-1.noarch
- craycli-0.83.4-1.aarch64
Expand All @@ -53,7 +53,7 @@ https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/noos/:
- iuf-cli-1.6.13-1.x86_64
- manifestgen-1.3.10-1.noarch
- metal-basecamp-1.2.6-1.x86_64
- metal-init-1.4.6-1.noarch
- metal-init-1.4.10-1.noarch
- metal-ipxe-2.4.8-1.noarch
- metal-nexus-1.3.0-3.38.0_1.x86_64
- metal-observability-1.0.9-1.x86_64
Expand Down

0 comments on commit d874078

Please sign in to comment.