OCPBUGS-77895: Allow for override of agent vcpu and memory

The CI conformance tests need more resources than currently
configured for installations. Allow these settings to be
overridden. This requires a corresponding change in
openshift/release to use higher limits.

Author: bfournie

common.sh

@@ -472,30 +472,30 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
   case "$SCENARIO" in
       "5CONTROL" )
           export NUM_MASTERS=5
-          export MASTER_VCPU=4
-          export MASTER_DISK=100
-          export MASTER_MEMORY=24576
+          export MASTER_VCPU="${MASTER_VCPU:-4}"
+          export MASTER_DISK="${MASTER_DISK:-100}"
+          export MASTER_MEMORY="${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 MASTER_VCPU="${MASTER_VCPU:-4}"
+          export MASTER_DISK="${MASTER_DISK:-100}"
+          export MASTER_MEMORY="${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 MASTER_VCPU="${MASTER_VCPU:-4}"
+          export MASTER_DISK="${MASTER_DISK:-100}"
+          export MASTER_MEMORY="${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 MASTER_VCPU="${MASTER_VCPU:-8}"
+          export MASTER_DISK="${MASTER_DISK:-100}"
+          export MASTER_MEMORY="${MASTER_MEMORY:-32768}"
           export NUM_ARBITERS=1
           export ARBITER_VCPU=2
           export ARBITER_MEMORY=8192
@@ -504,27 +504,27 @@ 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 MASTER_VCPU="${MASTER_VCPU:-8}"
+          export MASTER_DISK="${MASTER_DISK:-100}"
+          export MASTER_MEMORY="${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 MASTER_VCPU="${MASTER_VCPU:-4}"
+          export MASTER_DISK="${MASTER_DISK:-100}"
+          export MASTER_MEMORY="${MASTER_MEMORY:-32768}"
           export NUM_WORKERS=2
-          export WORKER_VCPU=4
-          export WORKER_DISK=100
-          export WORKER_MEMORY=9000
+          export WORKER_VCPU="${WORKEr_VCPU:-4}"
+          export WORKER_DISK="${WORKER_DISK:-100}"
+          export WORKER_MEMORY="${WORKER_MEMORY:-9000}"
           ;;
       "SNO" )
           export NUM_MASTERS=1
-          export MASTER_VCPU=8
-          export MASTER_DISK=100
-          export MASTER_MEMORY=32768
+          export MASTER_VCPU="${MASTER_VCPU:-8}"
+          export MASTER_DISK="${MASTER_DISK:-100}"
+          export MASTER_MEMORY="${MASTER_MEMORY:-32768}"
           export NUM_WORKERS=0
           export NETWORK_TYPE="OVNKubernetes"
           export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
@@ -535,9 +535,9 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
           ;;
       "SNOMIN" )
           export NUM_MASTERS=1
-          export MASTER_VCPU=4
-          export MASTER_DISK=100
-          export MASTER_MEMORY=32768
+          export MASTER_VCPU="${MASTER_VCPU:-4}"
+          export MASTER_DISK="${MASTER_DISK:-100}"
+          export MASTER_MEMORY="${MASTER_MEMORY:-32768}"
           export NUM_WORKERS=0
           export NETWORK_TYPE="OVNKubernetes"
           export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"