Skip to content

Commit 6332002

Browse files
committed
Restore agent MASTER_MEMORY default to 16GiB
The default MASTER_MEMORY was changed in some agent scenarios in order to work around a problem in OKD where FCOS would use only 20% of RAM for the ephemeral storage instead of 50%. Other scenarios were later changed to match when tests started failing in 4.19 due to OCPBUGS-62790. Return the defaults to the minimum values validated by assisted-service in ABI, so that any future regressions like OCPBUGS-62790 are caught immediately.
1 parent 000f634 commit 6332002

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

common.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -454,28 +454,28 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
454454
export NUM_MASTERS=5
455455
export MASTER_VCPU=${MASTER_VCPU:-4}
456456
export MASTER_DISK=${MASTER_DISK:-100}
457-
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
457+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
458458
export NUM_WORKERS=0
459459
;;
460460
"4CONTROL" )
461461
export NUM_MASTERS=4
462462
export MASTER_VCPU=${MASTER_VCPU:-4}
463463
export MASTER_DISK=${MASTER_DISK:-100}
464-
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
464+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
465465
export NUM_WORKERS=0
466466
;;
467467
"COMPACT" )
468468
export NUM_MASTERS=3
469469
export MASTER_VCPU=${MASTER_VCPU:-4}
470470
export MASTER_DISK=${MASTER_DISK:-100}
471-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
471+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
472472
export NUM_WORKERS=0
473473
;;
474474
"TNA" )
475475
export NUM_MASTERS=2
476476
export MASTER_VCPU=${MASTER_VCPU:-8}
477477
export MASTER_DISK=${MASTER_DISK:-100}
478-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
478+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
479479
export NUM_ARBITERS=1
480480
export ARBITER_VCPU=${ARBITER_VCPU:-2}
481481
export ARBITER_MEMORY=${ARBITER_MEMORY:-8192}
@@ -486,15 +486,15 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
486486
export NUM_MASTERS=2
487487
export MASTER_VCPU=${MASTER_VCPU:-8}
488488
export MASTER_DISK=${MASTER_DISK:-100}
489-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
489+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
490490
export NUM_WORKERS=0
491491
export ENABLE_TWO_NODE_FENCING="true"
492492
;;
493493
"HA" )
494494
export NUM_MASTERS=3
495495
export MASTER_VCPU=${MASTER_VCPU:-4}
496496
export MASTER_DISK=${MASTER_DISK:-100}
497-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
497+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
498498
export NUM_WORKERS=2
499499
export WORKER_VCPU=${WORKER_VCPU:-4}
500500
export WORKER_DISK=${WORKER_DISK:-100}
@@ -504,7 +504,7 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
504504
export NUM_MASTERS=1
505505
export MASTER_VCPU=${MASTER_VCPU:-8}
506506
export MASTER_DISK=${MASTER_DISK:-100}
507-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
507+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
508508
export NUM_WORKERS=0
509509
export NETWORK_TYPE="OVNKubernetes"
510510
export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"

0 commit comments

Comments
 (0)