Skip to content

Commit 804d1ef

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 022615a commit 804d1ef

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

common.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -472,28 +472,28 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
472472
export NUM_MASTERS=5
473473
export MASTER_VCPU=${MASTER_VCPU:-4}
474474
export MASTER_DISK=${MASTER_DISK:-100}
475-
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
475+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
476476
export NUM_WORKERS=0
477477
;;
478478
"4CONTROL" )
479479
export NUM_MASTERS=4
480480
export MASTER_VCPU=${MASTER_VCPU:-4}
481481
export MASTER_DISK=${MASTER_DISK:-100}
482-
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
482+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
483483
export NUM_WORKERS=0
484484
;;
485485
"COMPACT" )
486486
export NUM_MASTERS=3
487487
export MASTER_VCPU=${MASTER_VCPU:-4}
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
;;
492492
"TNA" )
493493
export NUM_MASTERS=2
494494
export MASTER_VCPU=${MASTER_VCPU:-8}
495495
export MASTER_DISK=${MASTER_DISK:-100}
496-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
496+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
497497
export NUM_ARBITERS=1
498498
export ARBITER_VCPU=${ARBITER_VCPU:-2}
499499
export ARBITER_MEMORY=${ARBITER_MEMORY:-8192}
@@ -505,7 +505,7 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
505505
export NUM_MASTERS=2
506506
export MASTER_VCPU=${MASTER_VCPU:-8}
507507
export MASTER_DISK=${MASTER_DISK:-100}
508-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
508+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
509509
export NUM_WORKERS=${NUM_WORKERS:-0}
510510
export WORKER_DISK=${WORKER_DISK:-100}
511511
export ENABLE_TWO_NODE_FENCING="true"
@@ -514,7 +514,7 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
514514
export NUM_MASTERS=3
515515
export MASTER_VCPU=${MASTER_VCPU:-4}
516516
export MASTER_DISK=${MASTER_DISK:-100}
517-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
517+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
518518
export NUM_WORKERS=2
519519
export WORKER_VCPU=${WORKER_VCPU:-4}
520520
export WORKER_DISK=${WORKER_DISK:-100}
@@ -524,7 +524,7 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
524524
export NUM_MASTERS=1
525525
export MASTER_VCPU=${MASTER_VCPU:-8}
526526
export MASTER_DISK=${MASTER_DISK:-100}
527-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
527+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
528528
export NUM_WORKERS=0
529529
export NETWORK_TYPE="OVNKubernetes"
530530
export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
@@ -541,7 +541,7 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
541541
export NUM_MASTERS=1
542542
export MASTER_VCPU=${MASTER_VCPU:-4}
543543
export MASTER_DISK=${MASTER_DISK:-100}
544-
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
544+
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
545545
export NUM_WORKERS=0
546546
export NETWORK_TYPE="OVNKubernetes"
547547
export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
@@ -560,6 +560,9 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
560560
if ((MASTER_VCPU < 10)); then
561561
export MASTER_VCPU=10
562562
fi
563+
if ((MASTER_MEMORY < 17920)); then
564+
export MASTER_MEMORY=17920
565+
fi
563566
if [ "${SCENARIO}" == "SNO" ]; then
564567
if ((MASTER_VCPU < 16)); then
565568
export MASTER_VCPU=16

0 commit comments

Comments
 (0)