Skip to content

Commit facf544

Browse files
Feature/no operator installation (#110)
* use run_tests.sh in operator tests * No operators installed in nightly/custom/selfservice tests.
1 parent 449bee9 commit facf544

File tree

4 files changed

+11
-21
lines changed

4 files changed

+11
-21
lines changed

tools/testing-toolbox/jjb/custom_test_jobs.j2

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@
3535
choices:{% for platform in platforms[testsuite.name] %}
3636
- {{ platform.display_name }}, {{ platform.version }} <{{ platform.id }}|{{ platform.version }}>{% endfor %}
3737
description: On which platform should the test run?
38-
- extended-choice:
39-
name: OPERATOR_VERSION
40-
description: Version of the operator (binary) this test should use
41-
property-file: /var/jenkins_home/workspace/Available Versions/versions.properties
42-
property-key: {{ testsuite.name }}
43-
quote-value: false
44-
visible-items: 10
4538
- string:
4639
name: BEKU_SUITE
4740
description: Testsuite which is used (beku feature)
@@ -87,7 +80,7 @@
8780
--env K8S_VERSION=$K8S_VERSION \
8881
--env GIT_BRANCH=$GIT_BRANCH \
8982
--env BEKU_SUITE=$BEKU_SUITE \
90-
--env OPERATOR_VERSION=$OPERATOR_VERSION \
83+
--env OPERATOR_VERSION=NONE \
9184
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
9285
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
9386
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \
@@ -127,7 +120,6 @@
127120
custom-message: |
128121
*platform:* $TEST_PLATFORM
129122
*branch or tag:* `$GIT_BRANCH_OR_TAG`
130-
*operator version:* `$OPERATOR_VERSION`
131123
(<$BUILD_URL|Open in classic Jenkins UI>)
132124
(<${BUILD_URL}artifact/testsuite/target/logs.html|Open logs overview>)
133125
- description-setter:

tools/testing-toolbox/jjb/nightly_test_jobs.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
--env PLATFORM='{{ testsuite.nightly_test.platform }}' \
6060
--env GIT_BRANCH=main \
6161
--env BEKU_SUITE=nightly \
62-
--env OPERATOR_VERSION=DEV \
62+
--env OPERATOR_VERSION=NONE \
6363
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
6464
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
6565
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \

tools/testing-toolbox/jjb/self_service_test_jobs.j2

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@
2020
choices:{% for platform in platforms[testsuite.name] %}
2121
- {{ platform.display_name }}, {{ platform.version }} <{{ platform.id }}|{{ platform.version }}>{% endfor %}
2222
description: On which platform should the test run?
23-
- extended-choice:
24-
name: OPERATOR_VERSION
25-
description: Version of the operator (binary) this test should use
26-
property-file: /var/jenkins_home/workspace/Available Versions/versions.properties
27-
property-key: {{ testsuite.name }}
28-
quote-value: false
29-
visible-items: 10
3023
- string:
3124
name: CLUSTER_NICKNAME
3225
description: Nickname of the cluster to be created (mandatory)
@@ -74,7 +67,7 @@
7467
--env TESTSUITE={{ testsuite.name }} \
7568
--env PLATFORM=$PLATFORM_ID \
7669
--env K8S_VERSION=$K8S_VERSION \
77-
--env OPERATOR_VERSION=$OPERATOR_VERSION \
70+
--env OPERATOR_VERSION=NONE \
7871
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
7972
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
8073
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \

tools/testing-toolbox/templates/test.sh.j2

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ sleep 60
55
# Install tool for test suite expansion
66
pip install beku-stackabletech
77

8+
# Install stackablectl
9+
curl -L https://github.com/stackabletech/stackable-cockpit/releases/latest/download/stackablectl-x86_64-unknown-linux-gnu --output /usr/local/bin/stackablectl
10+
chmod a+x /usr/local/bin/stackablectl
11+
12+
# Clone repo of system under test
813
{% if git_branch %}
914
git clone -b {{ git_branch }} https://github.com/stackabletech/{{ testsuite.git_repo }}.git
1015
{% else %}
@@ -15,15 +20,15 @@ git clone https://github.com/stackabletech/{{ testsuite.git_repo }}.git
1520
{% endfor %}
1621

1722

23+
# Tests want to know where to pipe their logs to
1824
export VECTOR_AGGREGATOR=vector-aggregator.t2-cluster-logging.svc.cluster.local:6000
1925

2026
{% if beku_suite %}
21-
(cd {{ testsuite.git_repo }}/ && beku --suite {{ beku_suite }})
27+
(cd {{ testsuite.git_repo }}/ && ./scripts/run_tests.sh --test-suite {{ beku_suite }} {{ test_params }})
2228
{% else %}
23-
(cd {{ testsuite.git_repo }}/ && beku)
29+
(cd {{ testsuite.git_repo }}/ && ./scripts/run_tests.sh {{ test_params }})
2430
{% endif %}
2531

26-
(cd {{ testsuite.git_repo }}/tests/_work && kubectl kuttl test {{ test_params }})
2732
exit_code=$?
2833

2934
# cleanup of the test resources might take a while, so we wait another minute

0 commit comments

Comments
 (0)