From 6284ee3db0f886c90f6b2626dcd174814ac76096 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Date: Thu, 3 Aug 2023 21:12:46 +0200
Subject: [PATCH] Revert test changes that broke tests (#268)

* Revert test changes that broke tests

* changelog
---
 CHANGELOG.md                                                  | 3 ++-
 .../templates/kuttl/logging/04-deploy-history-server.yaml.j2  | 3 ++-
 .../kuttl/pod_overrides/06-deploy-history-server.yaml.j2      | 3 ++-
 tests/templates/kuttl/smoke/06-deploy-history-server.yaml.j2  | 3 ++-
 .../spark-history-server/06-deploy-history-server.yaml.j2     | 3 ++-
 tests/test-definition.yaml                                    | 4 ++--
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 213def84..4281eda9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,10 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- Default stackableVersion to operator version. It is recommended to remove `spec.image.stackableVersion` from your custom resources ([#267]).
+- Default stackableVersion to operator version. It is recommended to remove `spec.image.stackableVersion` from your custom resources ([#267], [#268]).
 
 [#267]: https://github.com/stackabletech/spark-k8s-operator/pull/267
+[#268]: https://github.com/stackabletech/spark-k8s-operator/pull/268
 
 ## [23.7.0] - 2023-07-14
 
diff --git a/tests/templates/kuttl/logging/04-deploy-history-server.yaml.j2 b/tests/templates/kuttl/logging/04-deploy-history-server.yaml.j2
index 065fcc75..7cc64b78 100644
--- a/tests/templates/kuttl/logging/04-deploy-history-server.yaml.j2
+++ b/tests/templates/kuttl/logging/04-deploy-history-server.yaml.j2
@@ -22,7 +22,8 @@ metadata:
   name: spark-history
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['spark'] }}"
+    productVersion: "{{ test_scenario['values']['spark'].split('-stackable')[0] }}"
+    stackableVersion: "{{ test_scenario['values']['spark'].split('-stackable')[1] }}"
   vectorAggregatorConfigMapName: spark-vector-aggregator-discovery
   logFileDirectory:
     s3:
diff --git a/tests/templates/kuttl/pod_overrides/06-deploy-history-server.yaml.j2 b/tests/templates/kuttl/pod_overrides/06-deploy-history-server.yaml.j2
index d1e774f3..cc3d7170 100644
--- a/tests/templates/kuttl/pod_overrides/06-deploy-history-server.yaml.j2
+++ b/tests/templates/kuttl/pod_overrides/06-deploy-history-server.yaml.j2
@@ -25,7 +25,8 @@ metadata:
   name: spark-history
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['spark'] }}"
+    productVersion: "{{ test_scenario['values']['spark'].split('-stackable')[0] }}"
+    stackableVersion: "{{ test_scenario['values']['spark'].split('-stackable')[1] }}"
   logFileDirectory:
     s3:
       prefix: eventlogs/
diff --git a/tests/templates/kuttl/smoke/06-deploy-history-server.yaml.j2 b/tests/templates/kuttl/smoke/06-deploy-history-server.yaml.j2
index 217b662d..e57d720c 100644
--- a/tests/templates/kuttl/smoke/06-deploy-history-server.yaml.j2
+++ b/tests/templates/kuttl/smoke/06-deploy-history-server.yaml.j2
@@ -25,7 +25,8 @@ metadata:
   name: spark-history
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['spark'] }}"
+    productVersion: "{{ test_scenario['values']['spark'].split('-stackable')[0] }}"
+    stackableVersion: "{{ test_scenario['values']['spark'].split('-stackable')[1] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/spark-history-server/06-deploy-history-server.yaml.j2 b/tests/templates/kuttl/spark-history-server/06-deploy-history-server.yaml.j2
index 217b662d..e57d720c 100644
--- a/tests/templates/kuttl/spark-history-server/06-deploy-history-server.yaml.j2
+++ b/tests/templates/kuttl/spark-history-server/06-deploy-history-server.yaml.j2
@@ -25,7 +25,8 @@ metadata:
   name: spark-history
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['spark'] }}"
+    productVersion: "{{ test_scenario['values']['spark'].split('-stackable')[0] }}"
+    stackableVersion: "{{ test_scenario['values']['spark'].split('-stackable')[1] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 2162e59f..95f8b8de 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -15,8 +15,8 @@ dimensions:
       - "false"
   - name: spark
     values:
-      - 3.3.0
-      - 3.4.0
+      - 3.3.0-stackable0.0.0-dev
+      - 3.4.0-stackable0.0.0-dev
   - name: ny-tlc-report
     values:
       - 0.1.0