Fix path to KUTTL in multiinstance test (#1967)

Signed-off-by: Israel Blancas <[email protected]> Co-authored-by: Ben B <[email protected]>
jaegertracing · Jun 28, 2022 · 7ae5b46 · 7ae5b46
1 parent be4a30f
commit 7ae5b46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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/...tiinstance/03-create-second-instance.yaml → ...e/03-create-second-instance.yaml.template b/...tiinstance/03-create-second-instance.yaml → ...e/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
@@ -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