Skip to content

Commit 473573f

Browse files
committed
feat: add version check for sno agent
SNO ABI flow will support min 4vCPU in 4.22 and above, so older versions will not pass validation adding check to fail early Removed SNOMIN in favor of setting the default across the board Signed-off-by: ehila <ehila@redhat.com>
1 parent 0e95a24 commit 473573f

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

common.sh

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -521,21 +521,12 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
521521
export WORKER_MEMORY=9000
522522
;;
523523
"SNO" )
524-
export NUM_MASTERS=1
525-
export MASTER_VCPU=8
526-
export MASTER_DISK=100
527-
export MASTER_MEMORY=32768
528-
export NUM_WORKERS=0
529-
export NETWORK_TYPE="OVNKubernetes"
530-
export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
531-
if [[ "${AGENT_PLATFORM_TYPE}" != "external" ]] && [[ "${AGENT_PLATFORM_TYPE}" != "none" ]]; then
532-
echo "Invalid value ${AGENT_PLATFORM_TYPE}, use 'none' or 'external'."
533-
exit 1
524+
local vcpu="4"
525+
if is_lower_version "$OPENSHIFT_VERSION" "4.22"; then
526+
vcpu="8"
534527
fi
535-
;;
536-
"SNOMIN" )
537528
export NUM_MASTERS=1
538-
export MASTER_VCPU=4
529+
export MASTER_VCPU="${vcpu}"
539530
export MASTER_DISK=100
540531
export MASTER_MEMORY=32768
541532
export NUM_WORKERS=0

0 commit comments

Comments
 (0)