From 7ae5b46bbba6c34673198168b187e84a4eb023a6 Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Tue, 28 Jun 2022 10:39:40 +0200 Subject: [PATCH] Fix path to KUTTL in multiinstance test (#1967) Signed-off-by: Israel Blancas Co-authored-by: Ben B --- hack/common.sh | 1 + ...nd-instance.yaml => 03-create-second-instance.yaml.template} | 2 +- tests/e2e/elasticsearch/render.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) rename tests/e2e/elasticsearch/es-multiinstance/{03-create-second-instance.yaml => 03-create-second-instance.yaml.template} (64%) diff --git a/hack/common.sh b/hack/common.sh index 45ac7e004..8dcd1f060 100644 --- a/hack/common.sh +++ b/hack/common.sh @@ -8,3 +8,4 @@ export EXAMPLES_DIR=$ROOT_DIR/examples # Tools export GOMPLATE=$ROOT_DIR/bin/gomplate export YQ=$ROOT_DIR/bin/yq +export KUTTL=$ROOT_DIR/bin/kubectl-kuttl diff --git a/tests/e2e/elasticsearch/es-multiinstance/03-create-second-instance.yaml b/tests/e2e/elasticsearch/es-multiinstance/03-create-second-instance.yaml.template similarity index 64% rename from tests/e2e/elasticsearch/es-multiinstance/03-create-second-instance.yaml rename to tests/e2e/elasticsearch/es-multiinstance/03-create-second-instance.yaml.template index b227af040..9064f6a3e 100644 --- a/tests/e2e/elasticsearch/es-multiinstance/03-create-second-instance.yaml +++ b/tests/e2e/elasticsearch/es-multiinstance/03-create-second-instance.yaml.template @@ -3,4 +3,4 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep commands: - script: "kubectl apply -f ./01-install.yaml -n jaeger-e2e-multiinstance-test" - - script: "kubectl kuttl assert ./01-assert.yaml -n jaeger-e2e-multiinstance-test --timeout 1000" + - script: "{{ .Env.KUTTL }} assert ./01-assert.yaml -n jaeger-e2e-multiinstance-test --timeout 1000" diff --git a/tests/e2e/elasticsearch/render.sh b/tests/e2e/elasticsearch/render.sh index eac1e319c..380189455 100755 --- a/tests/e2e/elasticsearch/render.sh +++ b/tests/e2e/elasticsearch/render.sh @@ -66,6 +66,7 @@ if [ "$IS_OPENSHIFT" = "true" ]; then start_test "es-multiinstance" jaeger_name="instance-1" render_install_jaeger "$jaeger_name" "production_autoprovisioned" "01" + $GOMPLATE -f ./03-create-second-instance.yaml.template -o 03-create-second-instance.yaml else skip_test "es-multiinstance" "This test is only supported in OpenShift" fi