Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CASMINST-6406 #2727

Merged
merged 1 commit into from
Aug 18, 2023
Merged

CASMINST-6406 #2727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion assets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ KUBERNETES_ASSETS=(
PIT_IMAGE_ID=6.1.2
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"
"https://artifactory.algol60.net/artifactory/csm-images/stable/pre-install-toolkit/${PIT_IMAGE_ID}/installed.deps-${PIT_IMAGE_ID}-${NCN_ARCH}.packages"
)

# The image ID may not always match the other images and should be defined individually.
Expand Down
6 changes: 3 additions & 3 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ kubectl get secrets -n loftsman site-init -o jsonpath='{.data.customizations\.ya
num_workers=$(kubectl get nodes | grep ncn-w | wc -l)
if [ $num_workers -le 4 ]; then
dist=$(uname | awk '{print tolower($0)}')
${ROOTDIR}/shasta-cfg/utils/bin/${dist}/yq m -i --overwrite "${BUILDDIR}/customizations.yaml" "${ROOTDIR}/tds_cpu_requests.yaml"
${ROOTDIR}/shasta-cfg/utils/bin/${dist}/yq m -i --overwrite "${BUILDDIR}/customizations.yaml" "${ROOTDIR}/lib/tds-cpu-requests.yaml"
kubectl delete secret -n loftsman site-init
kubectl create secret -n loftsman generic site-init --from-file="${BUILDDIR}/customizations.yaml"
fi
Expand All @@ -80,8 +80,8 @@ deploy "${BUILDDIR}/manifests/platform.yaml"
deploy "${BUILDDIR}/manifests/keycloak-gatekeeper.yaml"

# Create secret with HPE signing key
if [[ -f "${ROOTDIR}/hpe-signing-key.asc" ]]; then
kubectl create secret generic hpe-signing-key -n services --from-file=gpg-pubkey="${ROOTDIR}/hpe-signing-key.asc" --dry-run=client --save-config -o yaml | kubectl apply -f -
if [[ -f "${ROOTDIR}/security/hpe-signing-key.asc" ]]; then
kubectl create secret generic hpe-signing-key -n services --from-file=gpg-pubkey="${ROOTDIR}/security/hpe-signing-key.asc" --dry-run=client --save-config -o yaml | kubectl apply -f -
fi

# Upload SLS Input file to S3
Expand Down
0 tds_cpu_requests.yaml → lib/tds-cpu-requests.yaml
View file
Open in desktop
File renamed without changes.
9 changes: 3 additions & 6 deletions release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ yq write -i ${BUILDDIR}/manifests/sysmgmt.yaml 'spec.charts.(name==cray-csm-bare
yq write -i ${BUILDDIR}/manifests/sysmgmt.yaml 'spec.charts.(name==cray-csm-barebones-recipe-install).values.cray-import-kiwi-recipe-image.import_job.PRODUCT_NAME' "${RELEASE_NAME}"
yq write -i ${BUILDDIR}/manifests/sysmgmt.yaml 'spec.charts.(name==cray-csm-barebones-recipe-install).values.cray-import-kiwi-recipe-image.import_job.name' "${RELEASE_NAME}-image-recipe-import-${RELEASE_VERSION}"

# Include the tds yaml in the tarball
cp "${ROOTDIR}/tds_cpu_requests.yaml" "${BUILDDIR}/tds_cpu_requests.yaml"

# Generate Nexus blob store configuration
generate-nexus-config blobstore <"${ROOTDIR}/nexus-blobstores.yaml" >"${BUILDDIR}/nexus-blobstores.yaml"

Expand Down Expand Up @@ -223,9 +220,9 @@ mv "${BUILDDIR}/tmp/wars/opt/cray/csm/workarounds" "${BUILDDIR}/workarounds"
rm -fr "${BUILDDIR}/tmp"

# Download pre-install toolkit
# NOTE: This value is printed in #livecd-ci-alerts (slack) when a build STARTS.
(
cd "${BUILDDIR}"
mkdir -p "${BUILDDIR}/images/pre-install-toolkit"
cd "${BUILDDIR}/images/pre-install-toolkit"
for url in "${PIT_ASSETS[@]}"; do cmd_retry download_with_sha "$url"; done
)

Expand Down Expand Up @@ -263,7 +260,7 @@ if [[ "${EMBEDDED_REPO_ENABLED:-yes}" = "yes" ]]; then
fi

# Download HPE GPG signing key (for verifying signed RPMs)
cmd_retry curl -sfSLRo "${BUILDDIR}/hpe-signing-key.asc" "$HPE_SIGNING_KEY"
cmd_retry curl -sfSLRo "${BUILDDIR}/security/hpe-signing-key.asc" "$HPE_SIGNING_KEY"

# Save cray/nexus-setup and quay.io/skopeo/stable images for use in install.sh
vendor-install-deps "$(basename "$BUILDDIR")" "${BUILDDIR}/vendor"
Expand Down