Skip to content

Feature/no operator installation #110

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
Mar 13, 2024
Merged

Feature/no operator installation #110

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
3655779
use run_tests.sh in operator tests
backstreetkiwi Mar 13, 2024
46486e1
No operators installed in nightly/custom/selfservice tests.
backstreetkiwi Mar 13, 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
10 changes: 1 addition & 9 deletions tools/testing-toolbox/jjb/custom_test_jobs.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@
choices:{% for platform in platforms[testsuite.name] %}
- {{ platform.display_name }}, {{ platform.version }} <{{ platform.id }}|{{ platform.version }}>{% endfor %}
description: On which platform should the test run?
- extended-choice:
name: OPERATOR_VERSION
description: Version of the operator (binary) this test should use
property-file: /var/jenkins_home/workspace/Available Versions/versions.properties
property-key: {{ testsuite.name }}
quote-value: false
visible-items: 10
- string:
name: BEKU_SUITE
description: Testsuite which is used (beku feature)
Expand Down Expand Up @@ -87,7 +80,7 @@
--env K8S_VERSION=$K8S_VERSION \
--env GIT_BRANCH=$GIT_BRANCH \
--env BEKU_SUITE=$BEKU_SUITE \
--env OPERATOR_VERSION=$OPERATOR_VERSION \
--env OPERATOR_VERSION=NONE \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \
Expand Down Expand Up @@ -127,7 +120,6 @@
custom-message: |
*platform:* $TEST_PLATFORM
*branch or tag:* `$GIT_BRANCH_OR_TAG`
*operator version:* `$OPERATOR_VERSION`
(<$BUILD_URL|Open in classic Jenkins UI>)
(<${BUILD_URL}artifact/testsuite/target/logs.html|Open logs overview>)
- description-setter:
Expand Down
2 changes: 1 addition & 1 deletion tools/testing-toolbox/jjb/nightly_test_jobs.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
--env PLATFORM='{{ testsuite.nightly_test.platform }}' \
--env GIT_BRANCH=main \
--env BEKU_SUITE=nightly \
--env OPERATOR_VERSION=DEV \
--env OPERATOR_VERSION=NONE \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \
Expand Down
9 changes: 1 addition & 8 deletions tools/testing-toolbox/jjb/self_service_test_jobs.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@
choices:{% for platform in platforms[testsuite.name] %}
- {{ platform.display_name }}, {{ platform.version }} <{{ platform.id }}|{{ platform.version }}>{% endfor %}
description: On which platform should the test run?
- extended-choice:
name: OPERATOR_VERSION
description: Version of the operator (binary) this test should use
property-file: /var/jenkins_home/workspace/Available Versions/versions.properties
property-key: {{ testsuite.name }}
quote-value: false
visible-items: 10
- string:
name: CLUSTER_NICKNAME
description: Nickname of the cluster to be created (mandatory)
Expand Down Expand Up @@ -74,7 +67,7 @@
--env TESTSUITE={{ testsuite.name }} \
--env PLATFORM=$PLATFORM_ID \
--env K8S_VERSION=$K8S_VERSION \
--env OPERATOR_VERSION=$OPERATOR_VERSION \
--env OPERATOR_VERSION=NONE \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
--env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \
Expand Down
11 changes: 8 additions & 3 deletions tools/testing-toolbox/templates/test.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ sleep 60
# Install tool for test suite expansion
pip install beku-stackabletech

# Install stackablectl
curl -L https://github.com/stackabletech/stackable-cockpit/releases/latest/download/stackablectl-x86_64-unknown-linux-gnu --output /usr/local/bin/stackablectl
chmod a+x /usr/local/bin/stackablectl

# Clone repo of system under test
{% if git_branch %}
git clone -b {{ git_branch }} https://github.com/stackabletech/{{ testsuite.git_repo }}.git
{% else %}
Expand All @@ -15,15 +20,15 @@ git clone https://github.com/stackabletech/{{ testsuite.git_repo }}.git
{% endfor %}


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

{% if beku_suite %}
(cd {{ testsuite.git_repo }}/ && beku --suite {{ beku_suite }})
(cd {{ testsuite.git_repo }}/ && ./scripts/run_tests.sh --test-suite {{ beku_suite }} {{ test_params }})
{% else %}
(cd {{ testsuite.git_repo }}/ && beku)
(cd {{ testsuite.git_repo }}/ && ./scripts/run_tests.sh {{ test_params }})
{% endif %}

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

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