PMM-14170 Review of Peter

Author: travagliad

pmm_qa/scripts/database_options.py

@@ -78,7 +78,7 @@
         "configurations": {"BUCKET_NAMES": 'bcp'}
     },
     "VALKEY": {
-        "versions": ["7-alpine", "8-bookworm"],
+        "versions": ["7", "8"],
         "configurations": {"CLIENT_VERSION": "3-dev-latest", "SETUP_TYPE": "", "TARBALL": ""}
     }
 }

pmm_qa/valkey/sentinel.conf.j2

@@ -19,4 +19,4 @@ protected-mode no
 
 # Logging
 loglevel notice
-logfile ""
+logfile ""

pmm_qa/valkey/valkey-primary.conf.j2

@@ -24,4 +24,4 @@ loglevel notice
 logfile ""
 
 # Memory management
-maxmemory-policy allkeys-lru
+maxmemory-policy allkeys-lru

pmm_qa/valkey/valkey-replica.conf.j2

@@ -25,4 +25,4 @@ loglevel notice
 logfile ""
 
 # Memory management
-maxmemory-policy allkeys-lru
+maxmemory-policy allkeys-lru

pmm_qa/valkey/valkey.yml

@@ -7,7 +7,11 @@
     metrics_mode: "{{ lookup('env', 'metrics_mode') }}"
     client_version: "{{ lookup('vars', 'extra_client_version', default=lookup('env','CLIENT_VERSION') | default('3-dev-latest', true) ) }}"
     admin_password: "{{ lookup('vars', 'extra_admin_password', default=lookup('env','ADMIN_PASSWORD') | default('admin', true) ) }}"
-    valkey_version: "{{ lookup('env', 'VALKEY_VERSION') | default('7-alpine', true) }}"
+    valkey_version_input: "{{ lookup('env', 'VALKEY_VERSION') | default('7', true) }}"
+    valkey_version_map:
+      '7': '7-alpine'
+      '8': '8-bookworm'
+    valkey_version: "{{ valkey_version_map[valkey_version_input] }}"
     valkey_image: "valkey/valkey:{{ valkey_version }}"
     valkey_network_name: "pmm-qa"
     valkey_password: "VKvl41568AsE"