From 4ec28d270760d21d5941e5f1ee24ab6cb904a160 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Tue, 21 Jan 2020 10:22:04 -0700 Subject: [PATCH] Set conformance version from k8s version --- scripts/test-helpers | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/test-helpers b/scripts/test-helpers index 060fcd7e92..e9edf58458 100755 --- a/scripts/test-helpers +++ b/scripts/test-helpers @@ -189,8 +189,15 @@ sonobuoy-test() { return 0 fi echo 'Starting sonobuoy tests' + local VERSION_CONFORMANCE=$(sed -e 's/[-+].*$//g' <<< "$VERSION_K8S") + + sonobuoy run \ + --config=scripts/sonobuoy-config.json \ + --plugin-env=e2e.E2E_USE_GO_RUNNER=true \ + --kube-conformance-image-version=${VERSION_CONFORMANCE} \ + --wait=30 \ + $@ & - sonobuoy run --config=scripts/sonobuoy-config.json --plugin-env=e2e.E2E_USE_GO_RUNNER=true --wait=30 $@ & local sonobuoyPID=$! local code=0 time wait $sonobuoyPID || code=$?