Custom Tests with Operator choice using new Python test script.

Author: backstreetkiwi

tools/testing-toolbox/create_testsuite.py

@@ -9,6 +9,7 @@
 platform_name = None
 k8s_version = None
 operator_version = None
+test_script_params = None
 git_branch = None
 beku_suite = None
 metadata_annotations = {}
@@ -85,12 +86,14 @@ def read_params():
         - GIT_BRANCH
         - BEKU_SUITE
         - OPERATOR_VERSION
+        - TEST_SCRIPT_PARAMS
         - METADATA_ANNOTATION_xyz
     """
     global testsuite_name
     global platform_name
     global k8s_version
     global operator_version
+    global test_script_params
     global git_branch
     global beku_suite
     global metadata_annotations
@@ -107,6 +110,8 @@ def read_params():
     platform_name, k8s_version = read_platform_and_k8s_version()
     if 'OPERATOR_VERSION' in os.environ:
         operator_version = os.environ["OPERATOR_VERSION"]
+    if 'TEST_SCRIPT_PARAMS' in os.environ:
+        test_script_params = os.environ["TEST_SCRIPT_PARAMS"]
     if 'GIT_BRANCH' in os.environ:
         git_branch = os.environ["GIT_BRANCH"]
     if 'BEKU_SUITE' in os.environ:
@@ -219,6 +224,11 @@ def create_testsuite():
         cluster_definition['metadata']['annotations'] = {}
     for key,value in metadata_annotations.items():
         cluster_definition['metadata']['annotations'][key] = value
-
     write_cluster_definition(cluster_definition)
-    write_test_script(testsuite, testsuite_platform_definition['test_params'] if 'test_params' in testsuite_platform_definition else '')
+
+    test_script_params_array = []
+    if 'test_params' in testsuite_platform_definition: 
+        test_script_params_array.append(testsuite_platform_definition['test_params'])
+    if test_script_params:
+        test_script_params_array.append(test_script_params)
+    write_test_script(testsuite, ' '.join(test_script_params_array))

tools/testing-toolbox/jjb/custom_test_jobs.j2

@@ -35,6 +35,13 @@
           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)
@@ -57,6 +64,7 @@
             export PLATFORM_ID=`echo $TEST_PLATFORM | cut -d '<' -f 2 | cut -d '|' -f 1`
             export K8S_VERSION=`echo $TEST_PLATFORM | cut -d '<' -f 2 | cut -d '|' -f 2 | cut -d '>' -f 1`
             export GIT_BRANCH=`echo $GIT_BRANCH_OR_TAG | sed s#origin/##g`
+            export TEST_SCRIPT_PARAM_OPERATOR_NAME=`echo {{ testsuite.name }} | sed s#-operator##g`
 
             # We're using Docker from within a Docker container, so we have to make sure to provide
             # the Docker daemon with the proper absolute path for volume mounts.
@@ -81,6 +89,7 @@
               --env GIT_BRANCH=$GIT_BRANCH \
               --env BEKU_SUITE=$BEKU_SUITE \
               --env OPERATOR_VERSION=NONE \
+              --env TEST_SCRIPT_PARAMS="--operator ${TEST_SCRIPT_PARAM_OPERATOR_NAME}=${OPERATOR_VERSION}" \
               --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} \

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

@@ -24,9 +24,9 @@ git clone https://github.com/stackabletech/{{ testsuite.git_repo }}.git
 export VECTOR_AGGREGATOR=vector-aggregator.t2-cluster-logging.svc.cluster.local:6000
 
 {% if beku_suite %}
-(cd {{ testsuite.git_repo }}/ && ./scripts/run_tests.sh --test-suite {{ beku_suite }} {{ test_params }})
+(cd {{ testsuite.git_repo }}/ && python ./scripts/run-tests --test-suite {{ beku_suite }} {{ test_params }})
 {% else %}
-(cd {{ testsuite.git_repo }}/ && ./scripts/run_tests.sh {{ test_params }})
+(cd {{ testsuite.git_repo }}/ && python ./scripts/run-tests {{ test_params }})
 {% endif %}
 
 exit_code=$?