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.

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

support for arm64 #454

Merged
merged 2 commits into from Sep 1, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion snc-library.sh
Expand Up @@ -58,7 +58,7 @@ function run_preflight_checks() {

#Just warn if architecture is not supported
case $ARCH in
x86_64|ppc64le|s390x)
x86_64|ppc64le|s390x|aarch64)
echo "The host arch is ${ARCH}.";;
*)
echo "The host arch is ${ARCH}. This is not supported by SNC!";;
Expand Down
2 changes: 1 addition & 1 deletion snc.sh
Expand Up @@ -66,7 +66,7 @@ echo "Setting OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE to ${OPENSHIFT_INSTALL_RE
# Extract openshift-install binary if not present in current directory
if test -z ${OPENSHIFT_INSTALL-}; then
echo "Extracting OpenShift baremetal installer binary"
${OC} adm release -a ${OPENSHIFT_PULL_SECRET_PATH} extract ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE} --command=openshift-baremetal-install --to .
${OC} adm release extract -a ${OPENSHIFT_PULL_SECRET_PATH} ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE} --command=openshift-baremetal-install --to .
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, oc became strict about parameter order?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes looks like it....this used to work for me before too

OPENSHIFT_INSTALL=./openshift-baremetal-install
fi

Expand Down
7 changes: 6 additions & 1 deletion tools.sh
Expand Up @@ -22,7 +22,12 @@ case "${ARCH}" in
x86_64)
yq_ARCH="amd64"
SNC_GENERATE_MACOS_BUNDLE=1
SNC_GENERATE_WINDOWS_BUNDLE=1
SNC_GENERATE_WINDOWS_BUNDLE=1
;;
aarch64)
yq_ARCH="arm64"
SNC_GENERATE_MACOS_BUNDLE=1
SNC_GENERATE_WINDOWS_BUNDLE=
;;
*)
yq_ARCH=${ARCH}
Expand Down