Skip to content

Allow custom images in tests #868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Allow custom images in tests #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a4e59
Allow custom images in tests
lfrancke Oct 16, 2024
3de7dc8
Merge branch 'main' into feat/custom-tests
lfrancke Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tests/templates/kuttl/cluster-operation/10-install-zookeeper.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/cluster-operation/20-stop-zookeeper.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/cluster-operation/30-pause-zookeeper.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/cluster-operation/40-restart-zookeeper.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/delete-rolegroup/05-install-zookeeper.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/delete-rolegroup/10-remove-secondary.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/logging/11-install-zookeeper.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/smoke/10-install-zookeeper.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/znode/10-install-zookeeper.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions tests/test-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading