Skip to content

Commit 77d2124

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 9a5608d commit 77d2124

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

common.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -451,28 +451,28 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
451451
export NUM_MASTERS=5
452452
export MASTER_VCPU=${MASTER_VCPU:-4}
453453
export MASTER_DISK=${MASTER_DISK:-100}
454-
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
454+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
455455
export NUM_WORKERS=0
456456
;;
457457
"4CONTROL" )
458458
export NUM_MASTERS=4
459459
export MASTER_VCPU=${MASTER_VCPU:-4}
460460
export MASTER_DISK=${MASTER_DISK:-100}
461-
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
461+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
462462
export NUM_WORKERS=0
463463
;;
464464
"COMPACT" )
465465
export NUM_MASTERS=3
466466
export MASTER_VCPU=${MASTER_VCPU:-4}
467467
export MASTER_DISK=${MASTER_DISK:-100}
468-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
468+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
469469
export NUM_WORKERS=0
470470
;;
471471
"TNA" )
472472
export NUM_MASTERS=2
473473
export MASTER_VCPU=${MASTER_VCPU:-8}
474474
export MASTER_DISK=${MASTER_DISK:-100}
475-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
475+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
476476
export NUM_ARBITERS=1
477477
export ARBITER_VCPU=${ARBITER_VCPU:-2}
478478
export ARBITER_MEMORY=${ARBITER_MEMORY:-8192}
@@ -483,15 +483,15 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
483483
export NUM_MASTERS=2
484484
export MASTER_VCPU=${MASTER_VCPU:-8}
485485
export MASTER_DISK=${MASTER_DISK:-100}
486-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
486+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
487487
export NUM_WORKERS=0
488488
export ENABLE_TWO_NODE_FENCING="true"
489489
;;
490490
"HA" )
491491
export NUM_MASTERS=3
492492
export MASTER_VCPU=${MASTER_VCPU:-4}
493493
export MASTER_DISK=${MASTER_DISK:-100}
494-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
494+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
495495
export NUM_WORKERS=2
496496
export WORKER_VCPU=4
497497
export WORKER_DISK=${WORKER_DISK:-100}
@@ -501,7 +501,7 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
501501
export NUM_MASTERS=1
502502
export MASTER_VCPU=${MASTER_VCPU:-8}
503503
export MASTER_DISK=${MASTER_DISK:-100}
504-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
504+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
505505
export NUM_WORKERS=0
506506
export NETWORK_TYPE="OVNKubernetes"
507507
export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"

0 commit comments

Comments
 (0)