From c00496f34582902369280823776880f47d830d2e Mon Sep 17 00:00:00 2001 From: Doug Larson Date: Mon, 10 Jul 2023 09:11:26 -0400 Subject: [PATCH] Add s390x to edgeNodeFiles Signed-off-by: Doug Larson --- agent-install/edgeNodeFiles.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/agent-install/edgeNodeFiles.sh b/agent-install/edgeNodeFiles.sh index 245f2da7f..1d17de5a6 100755 --- a/agent-install/edgeNodeFiles.sh +++ b/agent-install/edgeNodeFiles.sh @@ -5,10 +5,10 @@ function getHznVersion() { local hzn_version=$(hzn version | grep "^Horizon CLI"); echo ${hzn_version##* }; } # Global constants -SUPPORTED_NODE_TYPES='ARM32-Deb ARM64-Deb AMD64-Deb x86_64-RPM arm64-macOS x86_64-macOS x86_64-Cluster ppc64le-RPM ppc64le-Cluster ALL' +SUPPORTED_NODE_TYPES='ARM32-Deb ARM64-Deb AMD64-Deb x86_64-RPM arm64-macOS x86_64-macOS x86_64-Cluster ppc64le-RPM ppc64le-Cluster s390x-RPM s390x-DEB ALL' EDGE_CLUSTER_TAR_FILE_NAME='horizon-agent-edge-cluster-files.tar.gz' -# Note: arch must prepend the following 2 variables when used - currently only amd64 and arm64 are built and pushed +# Note: arch must prepend the following 2 variables when used - currently only amd64, arm64, s390x are built and pushed AGENT_IMAGE_TAR_FILE='_anax.tar.gz' AGENT_IMAGE='_anax' @@ -720,7 +720,7 @@ function getHorizonPackageFiles() { putHorizonPkgsInCss $softwareFiles $opsys $pkgtype $arch fi - if [[ $opsys == 'macos' ]]; then #future: do this for all amd64/x86_64 + if [[ $opsys == 'macos' ]] || [[ $arch == 's390x' ]]; then #future: do this for all amd64/x86_64 # Set architectures to match what agent will use if [[ $arch == "x86_64" ]]; then @@ -790,6 +790,12 @@ function gatherHorizonPackageFiles() { if [[ $EDGE_NODE_TYPE == 'ppc64le-RPM' || $EDGE_NODE_TYPE == 'ALL' ]]; then getHorizonPackageFiles $agentSoftwareFiles 'linux' 'rpm' 'ppc64le' fi + if [[ $EDGE_NODE_TYPE == 's390x-RPM' || $EDGE_NODE_TYPE == 'ALL' ]]; then + getHorizonPackageFiles $agentSoftwareFiles 'linux' 'rpm' 's390x' + fi + if [[ $EDGE_NODE_TYPE == 's390x-Deb' || $EDGE_NODE_TYPE == 'ALL' ]]; then + getHorizonPackageFiles $agentSoftwareFiles 'linux' 'deb' 's390x' + fi # there are no packages to extract for edge-cluster, because that uses the agent docker image echo ""