Allow custom images in tests (#868)

stackabletech · Oct 21, 2024 · dc42c9b · dc42c9b
1 parent 3e0a1bb
commit dc42c9b
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 0 deletions.
diff --git a/tests/templates/kuttl/cluster-operation/10-install-zookeeper.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-zookeeper.yaml.j2
@@ -14,7 +14,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:

diff --git a/tests/templates/kuttl/cluster-operation/20-stop-zookeeper.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-zookeeper.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:

diff --git a/tests/templates/kuttl/cluster-operation/30-pause-zookeeper.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-pause-zookeeper.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:

diff --git a/tests/templates/kuttl/cluster-operation/40-restart-zookeeper.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-restart-zookeeper.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:

diff --git a/tests/templates/kuttl/delete-rolegroup/05-install-zookeeper.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/05-install-zookeeper.yaml.j2
@@ -14,7 +14,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     tls:

diff --git a/tests/templates/kuttl/delete-rolegroup/10-remove-secondary.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/10-remove-secondary.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     tls:

diff --git a/tests/templates/kuttl/logging/11-install-zookeeper.yaml.j2 b/tests/templates/kuttl/logging/11-install-zookeeper.yaml.j2
@@ -28,7 +28,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     vectorAggregatorConfigMapName: zookeeper-vector-aggregator-discovery

diff --git a/tests/templates/kuttl/smoke/10-install-zookeeper.yaml.j2 b/tests/templates/kuttl/smoke/10-install-zookeeper.yaml.j2
@@ -14,7 +14,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if test_scenario['values']['use-server-tls'] == 'true' %}

diff --git a/tests/templates/kuttl/znode/10-install-zookeeper.yaml.j2 b/tests/templates/kuttl/znode/10-install-zookeeper.yaml.j2
@@ -14,7 +14,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -3,9 +3,13 @@ dimensions:
   - name: zookeeper
     values:
       - 3.9.2
+      # To use a custom image, add a comma and the full name after the product version
+      # - 3.9.2,docker.stackable.tech/stackable/zookeeper:3.9.2-stackable0.0.0-dev
   - name: zookeeper-latest
     values:
       - 3.9.2
+      # To use a custom image, add a comma and the full name after the product version
+      # - 3.9.2,docker.stackable.tech/stackable/zookeeper:3.9.2-stackable0.0.0-dev
   - name: use-server-tls
     values:
       - "true"