From 2b5a2452e1a06cbf931ec514ab4894cb91e42a38 Mon Sep 17 00:00:00 2001
From: dwelch-spike <53876192+dwelch-spike@users.noreply.github.com>
Date: Fri, 26 Apr 2024 13:24:32 -0700
Subject: [PATCH] =?UTF-8?q?ci:=20tools-2894=20add=20tests=20for=20the=20ev?=
 =?UTF-8?q?ict-indexes-memory-pct=20and=20indexes-memory-bud=E2=80=A6=20(#?=
 =?UTF-8?q?42)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ci: add tests for the evict-indexes-memory-pct and indexes-memory-budget configs

* ci: remove flush-size from storage engine memory server 7.1 test
---
 testdata/cases/server71/conf-tests.json | 2 +-
 testdata/cases/server71/server71.conf   | 5 ++++-
 testdata/cases/server71/server71.yaml   | 3 ++-
 testdata/cases/server71/versions.json   | 2 +-
 testdata/cases/server71/yaml-tests.json | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/testdata/cases/server71/conf-tests.json b/testdata/cases/server71/conf-tests.json
index c85778b..2847b48 100644
--- a/testdata/cases/server71/conf-tests.json
+++ b/testdata/cases/server71/conf-tests.json
@@ -6,7 +6,7 @@
         "Arguments":["convert","--aerospike-version","7.1.0.0","--format","asconfig","--output","testdata/cases/server71/server71-res-.yaml"],
         "SkipServerTest":false,
         "ServerErrorAllowList":null,
-        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.1.0.0-rc1",
+        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.1.0.0-rc3",
         "DockerAuth":{"Username":"ASC_DOCKER_USER","Password":"ASC_DOCKER_PASS"}
     }
 ]
\ No newline at end of file
diff --git a/testdata/cases/server71/server71.conf b/testdata/cases/server71/server71.conf
index 9842307..d2a2cdd 100644
--- a/testdata/cases/server71/server71.conf
+++ b/testdata/cases/server71/server71.conf
@@ -55,9 +55,12 @@ namespace ns1 {
 	
 	storage-engine memory {
         data-size 32G
-		flush-size 1M
     }
 
+	evict-indexes-memory-pct 50
+
+	indexes-memory-budget 2147483648
+
 	nsup-period 2048
 
 	set s1 {
diff --git a/testdata/cases/server71/server71.yaml b/testdata/cases/server71/server71.yaml
index dd4db2f..797ea28 100644
--- a/testdata/cases/server71/server71.yaml
+++ b/testdata/cases/server71/server71.yaml
@@ -21,9 +21,11 @@ namespaces:
         stop-writes-used-pct: 70
         type: device
     - default-read-touch-ttl-pct: 50
+      evict-indexes-memory-pct: 50
       evict-sys-memory-pct: 80
       index-type:
         type: shmem
+      indexes-memory-budget: 2147483648
       name: ns1
       nsup-period: 2048
       replication-factor: 2
@@ -34,7 +36,6 @@ namespaces:
         type: shmem
       storage-engine:
         data-size: 34359738368
-        flush-size: 1048576
         type: memory
 network:
     fabric:
diff --git a/testdata/cases/server71/versions.json b/testdata/cases/server71/versions.json
index d26ac25..0d27a4f 100644
--- a/testdata/cases/server71/versions.json
+++ b/testdata/cases/server71/versions.json
@@ -1 +1 @@
-{"TestedVersion":"7.1.0.0-rc1","OriginallyUsedVersion":"7.1.0.0-rc1"}
\ No newline at end of file
+{"TestedVersion":"7.1.0.0-rc3","OriginallyUsedVersion":"7.1.0.0-rc3"}
\ No newline at end of file
diff --git a/testdata/cases/server71/yaml-tests.json b/testdata/cases/server71/yaml-tests.json
index 782a22a..5f4733f 100644
--- a/testdata/cases/server71/yaml-tests.json
+++ b/testdata/cases/server71/yaml-tests.json
@@ -6,7 +6,7 @@
         "Arguments":["convert","--aerospike-version","7.1.0.0","--format","yaml","--output","testdata/cases/server71/server71-res-.conf"],
         "SkipServerTest":false,
         "ServerErrorAllowList":null,
-        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.1.0.0-rc1",
+        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.1.0.0-rc3",
         "DockerAuth":{"Username":"ASC_DOCKER_USER","Password":"ASC_DOCKER_PASS"}
     }
 ]
\ No newline at end of file