diff --git a/tests/e2e/miscellaneous/cassandra-spark/01-assert.yaml.template b/tests/e2e/miscellaneous/cassandra-spark/01-assert.yaml.template index daa85096e..44aae3a7e 100644 --- a/tests/e2e/miscellaneous/cassandra-spark/01-assert.yaml.template +++ b/tests/e2e/miscellaneous/cassandra-spark/01-assert.yaml.template @@ -1,27 +1,27 @@ -# Assert the Jaeger is up and running -apiVersion: apps/v1 -kind: Deployment -metadata: - name: test-spark-deps -spec: - replicas: 1 -status: - readyReplicas: 1 ---- -# Assert the schema job was succeded -apiVersion: batch/v1 -kind: Job -metadata: - name: test-spark-deps-cassandra-schema-job -status: - succeeded: 1 ---- -# Assert the spark job was succeded -apiVersion: batch/v1 -kind: Job -metadata: - ownerReferences: - - kind: CronJob - name: test-spark-deps-spark-dependencies -status: - succeeded: 1 +# # Assert the Jaeger is up and running +# apiVersion: apps/v1 +# kind: Deployment +# metadata: +# name: test-spark-deps +# spec: +# replicas: 1 +# status: +# readyReplicas: 1 +# --- +# # Assert the schema job was succeded +# apiVersion: batch/v1 +# kind: Job +# metadata: +# name: test-spark-deps-cassandra-schema-job +# status: +# succeeded: 1 +# --- +# # Assert the spark job was succeded +# apiVersion: batch/v1 +# kind: Job +# metadata: +# ownerReferences: +# - kind: CronJob +# name: test-spark-deps-spark-dependencies +# status: +# succeeded: 1 diff --git a/tests/e2e/miscellaneous/render.sh b/tests/e2e/miscellaneous/render.sh index 04405b241..1ec277140 100755 --- a/tests/e2e/miscellaneous/render.sh +++ b/tests/e2e/miscellaneous/render.sh @@ -2,29 +2,29 @@ source $(dirname "$0")/../render-utils.sh -############################################################################### -# TEST NAME: cassandra-spark -############################################################################### -if [ $IS_OPENSHIFT = true ]; then - skip_test "cassandra-spark" "Test not supported in OpenShift" -else - start_test "cassandra-spark" - # Create Cassandra instance and assert it - render_install_cassandra "00" - # Create the Jaeger instance - export JAEGER_NAME=test-spark-deps - export DEP_SCHEDULE=true - export CASSANDRA_MODE=prod - $GOMPLATE -f $TEMPLATES_DIR/cassandra-jaeger-install.yaml.template -o ./01-install.yaml - - export CRONJOB_APIVERSION - if version_gt $KUBE_VERSION "1.24"; then - CRONJOB_APIVERSION="batch/v1" - else - CRONJOB_APIVERSION="batch/v1beta1" - fi - $GOMPLATE -f ./01-assert.yaml.template -o ./01-assert.yaml -fi +# ############################################################################### +# # TEST NAME: cassandra-spark +# ############################################################################### +# if [ $IS_OPENSHIFT = true ]; then +# skip_test "cassandra-spark" "Test not supported in OpenShift" +# else +# start_test "cassandra-spark" +# # Create Cassandra instance and assert it +# render_install_cassandra "00" +# # Create the Jaeger instance +# export JAEGER_NAME=test-spark-deps +# export DEP_SCHEDULE=true +# export CASSANDRA_MODE=prod +# $GOMPLATE -f $TEMPLATES_DIR/cassandra-jaeger-install.yaml.template -o ./01-install.yaml + +# export CRONJOB_APIVERSION +# if version_gt $KUBE_VERSION "1.24"; then +# CRONJOB_APIVERSION="batch/v1" +# else +# CRONJOB_APIVERSION="batch/v1beta1" +# fi +# $GOMPLATE -f ./01-assert.yaml.template -o ./01-assert.yaml +# fi ###############################################################################