From 9e3f9ccb43afa69b25916a22a55f6df65f3b27ff Mon Sep 17 00:00:00 2001
From: Jelena Gvero <jelenagvero@microsoft.com>
Date: Thu, 15 Oct 2026 19:16:27 +0000
Subject: [PATCH 1/2] Correctly grab pbs version and change defaults.sh to
 constants.sh for better naming

---
 .../cluster-init/files/{default.sh => constants.sh}    |  0
 specs/default/cluster-init/files/hwlocs-install.sh     |  2 +-
 specs/default/cluster-init/files/utils.sh              | 10 ++++++----
 specs/default/cluster-init/roles/server-install.sh     |  2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename specs/default/cluster-init/files/{default.sh => constants.sh} (100%)

diff --git a/specs/default/cluster-init/files/default.sh b/specs/default/cluster-init/files/constants.sh
similarity index 100%
rename from specs/default/cluster-init/files/default.sh
rename to specs/default/cluster-init/files/constants.sh
diff --git a/specs/default/cluster-init/files/hwlocs-install.sh b/specs/default/cluster-init/files/hwlocs-install.sh
index d98a2f9..6e6ff7b 100755
--- a/specs/default/cluster-init/files/hwlocs-install.sh
+++ b/specs/default/cluster-init/files/hwlocs-install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 source "${CYCLECLOUD_PROJECT_PATH}/default/files/utils.sh" || exit 1
-source "${CYCLECLOUD_PROJECT_PATH}/default/files/default.sh" || fail
+source "${CYCLECLOUD_PROJECT_PATH}/default/files/constants.sh" || fail
 
 PLATFORM_VERSION=$(jetpack props get os.version) || fail
 
diff --git a/specs/default/cluster-init/files/utils.sh b/specs/default/cluster-init/files/utils.sh
index de46cce..4fe97ae 100644
--- a/specs/default/cluster-init/files/utils.sh
+++ b/specs/default/cluster-init/files/utils.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${CYCLECLOUD_PROJECT_PATH}/default/files/default.sh" || exit 1
+source "${CYCLECLOUD_PROJECT_PATH}/default/files/constants.sh" || exit 1
 
 function fail() {
     local errorMsg="$1"
@@ -27,10 +27,12 @@ function get_package_name() {
     local package_type=$1 # Contains "server", "client", or "execution"
 
     if [[ -z "$package_name" ]]; then
-        if [[ "${PBSPRO_VERSION%%.*}" -lt 20 ]]; then
-            echo "pbspro-${package_type}-${PBSPRO_VERSION}.x86_64.rpm"
+        local default_pbspro_version
+        default_pbspro_version=$(jetpack config pbspro.version "$PBSPRO_VERSION") || fail
+        if [[ "${default_pbspro_version%%.*}" -lt 20 ]]; then
+            echo "pbspro-${package_type}-${default_pbspro_version}.x86_64.rpm"
         else
-            echo "openpbs-${package_type}-${PBSPRO_VERSION}.x86_64.rpm"
+            echo "openpbs-${package_type}-${default_pbspro_version}.x86_64.rpm"
         fi
     else
         echo "$package_name"
diff --git a/specs/default/cluster-init/roles/server-install.sh b/specs/default/cluster-init/roles/server-install.sh
index 76ea0dc..43d1c8e 100644
--- a/specs/default/cluster-init/roles/server-install.sh
+++ b/specs/default/cluster-init/roles/server-install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 source "${CYCLECLOUD_PROJECT_PATH}/default/files/utils.sh" || exit 1
-source "${CYCLECLOUD_PROJECT_PATH}/default/files/default.sh" || fail
+source "${CYCLECLOUD_PROJECT_PATH}/default/files/constants.sh" || fail
 CLUSTER_NAME=$(jq -r .cluster "$CONFIG_PATH") || fail
 CONNECTION_URL=$(jq -r .url "$CONFIG_PATH") || fail
 IGNORE_WORKQ=$(jetpack config pbspro.queues.workq.ignore "False") || fail

From 3aead7863a5ddbfce60dfe9e1abc9fbb226ed3ba Mon Sep 17 00:00:00 2001
From: Jelena Gvero <jelenagvero@microsoft.com>
Date: Thu, 15 Oct 2026 21:00:47 +0000
Subject: [PATCH 2/2] Change PBSPRO_VERSION to be the default, not the local
 var

---
 specs/default/cluster-init/files/constants.sh |  2 +-
 specs/default/cluster-init/files/utils.sh     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/specs/default/cluster-init/files/constants.sh b/specs/default/cluster-init/files/constants.sh
index 3da1a1f..7c80631 100644
--- a/specs/default/cluster-init/files/constants.sh
+++ b/specs/default/cluster-init/files/constants.sh
@@ -1,4 +1,4 @@
 PBSPRO_AUTOSCALE_VERSION="2.1.0"
-PBSPRO_VERSION="20.0.1-0"
+DEFAULT_PBSPRO_VERSION="20.0.1-0"
 PBSPRO_HWLOCS_LIB_EL8="hwloc-libs-1.11.9-3.el8.x86_64.rpm"
 CONFIG_PATH="/opt/cycle/jetpack/config/connection.json"
\ No newline at end of file
diff --git a/specs/default/cluster-init/files/utils.sh b/specs/default/cluster-init/files/utils.sh
index 4fe97ae..995c9df 100644
--- a/specs/default/cluster-init/files/utils.sh
+++ b/specs/default/cluster-init/files/utils.sh
@@ -27,12 +27,12 @@ function get_package_name() {
     local package_type=$1 # Contains "server", "client", or "execution"
 
     if [[ -z "$package_name" ]]; then
-        local default_pbspro_version
-        default_pbspro_version=$(jetpack config pbspro.version "$PBSPRO_VERSION") || fail
-        if [[ "${default_pbspro_version%%.*}" -lt 20 ]]; then
-            echo "pbspro-${package_type}-${default_pbspro_version}.x86_64.rpm"
+        local pbspro_version
+        pbspro_version=$(jetpack config pbspro.version "$DEFAULT_PBSPRO_VERSION") || fail
+        if [[ "${pbspro_version%%.*}" -lt 20 ]]; then
+            echo "pbspro-${package_type}-${pbspro_version}.x86_64.rpm"
         else
-            echo "openpbs-${package_type}-${default_pbspro_version}.x86_64.rpm"
+            echo "openpbs-${package_type}-${pbspro_version}.x86_64.rpm"
         fi
     else
         echo "$package_name"