Skip to content

Commit 3dae054

Browse files
committed
skip logging tests for spark 4
1 parent 3e80b95 commit 3dae054

6 files changed

+25
-21
lines changed

tests/templates/kuttl/logging/05-deploy-history-server.yaml.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ metadata:
2222
name: spark-history
2323
spec:
2424
image:
25-
{% if test_scenario['values']['spark'].find(",") > 0 %}
26-
custom: "{{ test_scenario['values']['spark'].split(',')[1] }}"
27-
productVersion: "{{ test_scenario['values']['spark'].split(',')[0] }}"
25+
{% if test_scenario['values']['spark-logging'].find(",") > 0 %}
26+
custom: "{{ test_scenario['values']['spark-logging'].split(',')[1] }}"
27+
productVersion: "{{ test_scenario['values']['spark-logging'].split(',')[0] }}"
2828
{% else %}
29-
productVersion: "{{ test_scenario['values']['spark'] }}"
29+
productVersion: "{{ test_scenario['values']['spark-logging'] }}"
3030
{% endif %}
3131
pullPolicy: IfNotPresent
3232
vectorAggregatorConfigMapName: spark-vector-aggregator-discovery

tests/templates/kuttl/logging/06-deploy-automatic-log-config-spark-app.yaml.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ metadata:
55
name: spark-automatic-log-config
66
spec:
77
sparkImage:
8-
{% if test_scenario['values']['spark'].find(",") > 0 %}
9-
custom: "{{ test_scenario['values']['spark'].split(',')[1] }}"
10-
productVersion: "{{ test_scenario['values']['spark'].split(',')[0] }}"
8+
{% if test_scenario['values']['spark-logging'].find(",") > 0 %}
9+
custom: "{{ test_scenario['values']['spark-logging'].split(',')[1] }}"
10+
productVersion: "{{ test_scenario['values']['spark-logging'].split(',')[0] }}"
1111
{% else %}
12-
productVersion: "{{ test_scenario['values']['spark'] }}"
12+
productVersion: "{{ test_scenario['values']['spark-logging'] }}"
1313
{% endif %}
1414
pullPolicy: IfNotPresent
1515
image: oci.stackable.tech/stackable/ny-tlc-report:{{ test_scenario['values']['ny-tlc-report'] }}

tests/templates/kuttl/logging/07-deploy-custom-log-config-spark-app.yaml.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ metadata:
2222
name: spark-custom-log-config
2323
spec:
2424
sparkImage:
25-
{% if test_scenario['values']['spark'].find(",") > 0 %}
26-
custom: "{{ test_scenario['values']['spark'].split(',')[1] }}"
27-
productVersion: "{{ test_scenario['values']['spark'].split(',')[0] }}"
25+
{% if test_scenario['values']['spark-logging'].find(",") > 0 %}
26+
custom: "{{ test_scenario['values']['spark-logging'].split(',')[1] }}"
27+
productVersion: "{{ test_scenario['values']['spark-logging'].split(',')[0] }}"
2828
{% else %}
29-
productVersion: "{{ test_scenario['values']['spark'] }}"
29+
productVersion: "{{ test_scenario['values']['spark-logging'] }}"
3030
{% endif %}
3131
pullPolicy: IfNotPresent
3232
image: oci.stackable.tech/stackable/ny-tlc-report:{{ test_scenario['values']['ny-tlc-report'] }}

tests/templates/kuttl/logging/08-deploy-automatic-log-config-pyspark-app.yaml.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ metadata:
55
name: pyspark-automatic-log-config
66
spec:
77
sparkImage:
8-
{% if test_scenario['values']['spark'].find(",") > 0 %}
9-
custom: "{{ test_scenario['values']['spark'].split(',')[1] }}"
10-
productVersion: "{{ test_scenario['values']['spark'].split(',')[0] }}"
8+
{% if test_scenario['values']['spark-logging'].find(",") > 0 %}
9+
custom: "{{ test_scenario['values']['spark-logging'].split(',')[1] }}"
10+
productVersion: "{{ test_scenario['values']['spark-logging'].split(',')[0] }}"
1111
{% else %}
12-
productVersion: "{{ test_scenario['values']['spark'] }}"
12+
productVersion: "{{ test_scenario['values']['spark-logging'] }}"
1313
{% endif %}
1414
pullPolicy: IfNotPresent
1515
vectorAggregatorConfigMapName: spark-vector-aggregator-discovery

tests/templates/kuttl/logging/09-deploy-custom-log-config-pyspark-app.yaml.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ metadata:
2222
name: pyspark-custom-log-config
2323
spec:
2424
sparkImage:
25-
{% if test_scenario['values']['spark'].find(",") > 0 %}
26-
custom: "{{ test_scenario['values']['spark'].split(',')[1] }}"
27-
productVersion: "{{ test_scenario['values']['spark'].split(',')[0] }}"
25+
{% if test_scenario['values']['spark-logging'].find(",") > 0 %}
26+
custom: "{{ test_scenario['values']['spark-logging'].split(',')[1] }}"
27+
productVersion: "{{ test_scenario['values']['spark-logging'].split(',')[0] }}"
2828
{% else %}
29-
productVersion: "{{ test_scenario['values']['spark'] }}"
29+
productVersion: "{{ test_scenario['values']['spark-logging'] }}"
3030
{% endif %}
3131
pullPolicy: IfNotPresent
3232
vectorAggregatorConfigMapName: spark-vector-aggregator-discovery

tests/test-definition.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ dimensions:
1111
# Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
1212
# as in the example below.
1313
# - 3.5.6,oci.stackable.tech/sandbox/spark-k8s:3.5.6-stackable0.0.0-dev
14+
- name: spark-logging
15+
values:
16+
- 3.5.5
17+
- 3.5.6
1418
- name: spark-hbase-connector
1519
values:
1620
- 3.5.5
@@ -90,7 +94,7 @@ tests:
9094
- openshift
9195
- name: logging
9296
dimensions:
93-
- spark
97+
- spark-logging
9498
- ny-tlc-report
9599
- openshift
96100
- name: iceberg

0 commit comments

Comments
 (0)