diff --git a/hack/run-e2e-tests.sh b/hack/run-e2e-tests.sh index 197fe79ff..5f2955a5e 100755 --- a/hack/run-e2e-tests.sh +++ b/hack/run-e2e-tests.sh @@ -6,20 +6,13 @@ set -o pipefail set -o xtrace INTEGRATION_OUTPUT_JUNIT=${INTEGRATION_OUTPUT_JUNIT:-false} -VERSION=${VERSION:-test} +KUDO_VERSION=${KUDO_VERSION:-test} docker build . \ --build-arg ldflags_arg="" \ - -t "kudobuilder/controller:$VERSION" + -t "kudobuilder/controller:$KUDO_VERSION" -# Generate the kudo.yaml that is used to install KUDO while running e2e-test -./bin/kubectl-kudo init --webhook InstanceValidation \ - --unsafe-self-signed-webhook-ca --dry-run --output yaml \ - --kudo-image kudobuilder/controller:$VERSION \ - --kudo-image-pull-policy Never \ - > test/manifests/kudo.yaml - -sed "s/%version%/$VERSION/" kudo-e2e-test.yaml.tmpl > kudo-e2e-test.yaml +sed "s/%version%/$KUDO_VERSION/" kudo-e2e-test.yaml.tmpl > kudo-e2e-test.yaml if [ "$INTEGRATION_OUTPUT_JUNIT" == true ] then diff --git a/kudo-e2e-test.yaml.tmpl b/kudo-e2e-test.yaml.tmpl index 07b5f0376..b38bbf81d 100644 --- a/kudo-e2e-test.yaml.tmpl +++ b/kudo-e2e-test.yaml.tmpl @@ -5,6 +5,8 @@ manifestDirs: - ./test/manifests/ testDirs: - ./test/e2e +commands: +- command: ./bin/kubectl-kudo init --webhook InstanceValidation --unsafe-self-signed-webhook-ca --kudo-image kudobuilder/controller:%version% --kudo-image-pull-policy Never startKIND: true kindContainers: - kudobuilder/controller:%version%