update tests and docs

stackabletech · Aug 2, 2023 · 34d1a12 · 34d1a12
1 parent 376079e
commit 34d1a12
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 26 deletions.
diff --git a/docs/modules/hive/examples/getting_started/hive-postgres-s3.yaml b/docs/modules/hive/examples/getting_started/hive-postgres-s3.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   image:
     productVersion: 3.1.3
-    stackableVersion: 0.0.0-dev
   clusterConfig:
     database:
       connString: jdbc:postgresql://postgresql:5432/hive

diff --git a/docs/modules/hive/examples/getting_started/hive-postgres-s3.yaml.j2 b/docs/modules/hive/examples/getting_started/hive-postgres-s3.yaml.j2
@@ -6,7 +6,6 @@ metadata:
 spec:
   image:
     productVersion: 3.1.3
-    stackableVersion: {{ versions.hive }}
   clusterConfig:
     database:
       connString: jdbc:postgresql://postgresql:5432/hive

diff --git a/docs/modules/hive/pages/usage.adoc b/docs/modules/hive/pages/usage.adoc
@@ -182,7 +182,6 @@ metadata:
 spec:
   image:
     productVersion: 3.1.3
-    stackableVersion: 0.prerelease
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
@@ -225,7 +224,6 @@ metadata:
 spec:
   image:
     productVersion: 3.1.3
-    stackableVersion: 0.prerelease
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/stackable/metastore_db;create=true
@@ -295,7 +293,6 @@ metadata:
 spec:
   image:
     productVersion: 3.1.3
-    stackableVersion: 0.prerelease
   clusterConfig:
     database:
       connString: jdbc:postgresql://hive-postgresql.default.svc.cluster.local:5432/hive

diff --git a/tests/templates/kuttl/cluster-operation/10-install-hive.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-hive.yaml.j2
@@ -5,8 +5,7 @@ metadata:
   name: test-hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/hive;create=true

diff --git a/tests/templates/kuttl/cluster-operation/20-stop-hive.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-hive.yaml.j2
@@ -5,8 +5,7 @@ metadata:
   name: test-hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/hive;create=true

diff --git a/tests/templates/kuttl/cluster-operation/30-pause-hive.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-pause-hive.yaml.j2
@@ -5,8 +5,7 @@ metadata:
   name: test-hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/hive;create=true

diff --git a/tests/templates/kuttl/cluster-operation/40-restart-hive.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-restart-hive.yaml.j2
@@ -5,8 +5,7 @@ metadata:
   name: test-hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/hive;create=true

diff --git a/tests/templates/kuttl/logging/03-install-hive.yaml.j2 b/tests/templates/kuttl/logging/03-install-hive.yaml.j2
@@ -39,8 +39,7 @@ metadata:
   name: test-hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive'] }}"
   clusterConfig:
     database:
       connString: jdbc:postgresql://hive-postgresql:5432/hive

diff --git a/tests/templates/kuttl/orphaned-resources/01-install-hive.yaml.j2 b/tests/templates/kuttl/orphaned-resources/01-install-hive.yaml.j2
@@ -5,8 +5,7 @@ metadata:
   name: test-hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/hive;create=true

diff --git a/tests/templates/kuttl/orphaned-resources/03-remove-role-group.yaml.j2 b/tests/templates/kuttl/orphaned-resources/03-remove-role-group.yaml.j2
@@ -5,8 +5,7 @@ metadata:
   name: test-hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive-latest'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/hive;create=true

diff --git a/tests/templates/kuttl/resources/10-install-hive.yaml.j2 b/tests/templates/kuttl/resources/10-install-hive.yaml.j2
@@ -5,8 +5,7 @@ metadata:
   name: hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive'] }}"
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/hive;create=true

diff --git a/tests/templates/kuttl/smoke/60-install-hive.yaml.j2 b/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
@@ -5,8 +5,7 @@ metadata:
   name: hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive'].split('-stackable')[0] }}"
-    stackableVersion: "{{ test_scenario['values']['hive'].split('-stackable')[1] }}"
+    productVersion: "{{ test_scenario['values']['hive'] }}"
   clusterConfig:
     database:
       connString: jdbc:postgresql://postgresql:5432/hive

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -16,11 +16,11 @@ dimensions:
       - "12.5.6"
   - name: hive
     values:
-      - 2.3.9-stackable0.0.0-dev
-      - 3.1.3-stackable0.0.0-dev
+      - 2.3.9
+      - 3.1.3
   - name: hive-latest
     values:
-      - 3.1.3-stackable0.0.0-dev
+      - 3.1.3
   - name: openshift
     values:
       - "false"