Skip to content
Open
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -472,28 +472,24 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
"5CONTROL" )
export NUM_MASTERS=5
export MASTER_VCPU=4
export MASTER_DISK=100
export MASTER_MEMORY=24576
export NUM_WORKERS=0
;;
"4CONTROL" )
export NUM_MASTERS=4
export MASTER_VCPU=4
export MASTER_DISK=100
export MASTER_MEMORY=24576
export NUM_WORKERS=0
;;
"COMPACT" )
export NUM_MASTERS=3
export MASTER_VCPU=4
export MASTER_DISK=100
export MASTER_MEMORY=32768
export NUM_WORKERS=0
;;
"TNA" )
export NUM_MASTERS=2
export MASTER_VCPU=8
export MASTER_DISK=100
export MASTER_MEMORY=32768
export NUM_ARBITERS=1
export ARBITER_VCPU=2
Expand All @@ -504,15 +500,13 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
"TNF" )
export NUM_MASTERS=2
export MASTER_VCPU=8
export MASTER_DISK=100
export MASTER_MEMORY=32768
export NUM_WORKERS=0
export ENABLE_TWO_NODE_FENCING="true"
;;
"HA" )
export NUM_MASTERS=3
export MASTER_VCPU=4
export MASTER_DISK=100
export MASTER_MEMORY=32768
export NUM_WORKERS=2
export WORKER_VCPU=4
Expand All @@ -522,7 +516,6 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
"SNO" )
export NUM_MASTERS=1
export MASTER_VCPU=8
export MASTER_DISK=100
export MASTER_MEMORY=32768
export NUM_WORKERS=0
export NETWORK_TYPE="OVNKubernetes"
Expand All @@ -536,9 +529,12 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
invalidAgentValue
esac

export MASTER_DISK=100
# Increase master vCPU for agent OVE ISO installs or when certain operators like 'mtv' are used,
# as some operators require more CPUs.
# Also increase master disk storage
if [ "${AGENT_E2E_TEST_BOOT_MODE}" == "ISO_NO_REGISTRY" ]; then
export MASTER_DISK=220
export MASTER_VCPU=9
if [ "${SCENARIO}" == "SNO" ]; then
export MASTER_VCPU=16
Expand Down