Skip to content

Correctly grab pbs version instead of relying on default #113

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

Merged
Jelena Gvero (jgvero32) merged 2 commits into from
Oct 15, 2026
Merged

Correctly grab pbs version instead of relying on default #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e3f9cc
Correctly grab pbs version and change defaults.sh to constants.sh for…
jgvero32 Oct 15, 2026
3aead78
Change PBSPRO_VERSION to be the default, not the local var
jgvero32 Oct 15, 2026
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
2 changes: 1 addition & 1 deletion specs/default/cluster-init/files/default.sh → ...s/default/cluster-init/files/constants.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion specs/default/cluster-init/files/hwlocs-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 6 additions & 4 deletions specs/default/cluster-init/files/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 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}-${PBSPRO_VERSION}.x86_64.rpm"
echo "openpbs-${package_type}-${pbspro_version}.x86_64.rpm"
fi
else
echo "$package_name"
Expand Down
2 changes: 1 addition & 1 deletion specs/default/cluster-init/roles/server-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading