Skip to content

Commit 7672a42

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 Added SNOE2E to capture testing where more vcpu is required Signed-off-by: ehila <ehila@redhat.com>
1 parent 0e95a24 commit 7672a42

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

common.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,21 +521,24 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
521521
export WORKER_MEMORY=9000
522522
;;
523523
"SNO" )
524+
export MASTER_VCPU=4
525+
if is_lower_version "$OPENSHIFT_VERSION" "4.22"; then
526+
export MASTER_VCPU=8
527+
fi
524528
export NUM_MASTERS=1
525-
export MASTER_VCPU=8
526529
export MASTER_DISK=100
527530
export MASTER_MEMORY=32768
528531
export NUM_WORKERS=0
529532
export NETWORK_TYPE="OVNKubernetes"
530533
export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
531534
if [[ "${AGENT_PLATFORM_TYPE}" != "external" ]] && [[ "${AGENT_PLATFORM_TYPE}" != "none" ]]; then
532-
echo "Invalid value ${AGENT_PLATFORM_TYPE}, use 'none' or 'external'."
535+
echo "Invalid value ${AGENT_PLATFORM_TYPE}, use 'none' or 'external'."
533536
exit 1
534537
fi
535538
;;
536-
"SNOMIN" )
539+
"SNOE2E" )
537540
export NUM_MASTERS=1
538-
export MASTER_VCPU=4
541+
export MASTER_VCPU=8
539542
export MASTER_DISK=100
540543
export MASTER_MEMORY=32768
541544
export NUM_WORKERS=0

config_example.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -857,10 +857,10 @@ set -x
857857
# - SNO_IPV6
858858
# - SNO_IPV4_DHCP
859859
# - SNO_IPV6_DHCP
860-
# - SNOMIN_IPV4
861-
# - SNOMIN_IPV6
862-
# - SNOMIN_IPV4_DHCP
863-
# - SNOMIN_IPV6_DHCP
860+
# - SNOE2E_IPV4
861+
# - SNOE2E_IPV6
862+
# - SNOE2E_IPV4_DHCP
863+
# - SNOE2E_IPV6_DHCP
864864
# When set, the code internally sets other low level details such as disk size, memory, number of masters and workers,
865865
# cpu and ip stack.
866866
# This config variable is used only by the agent based installer and is required.

0 commit comments

Comments
 (0)