From 6baab2eda4198eab6c3546d533cda1acbb9fd13d Mon Sep 17 00:00:00 2001 From: Navid Shaikh Date: Tue, 6 Oct 2020 21:47:21 +0530 Subject: [PATCH] fix(e2e): Run eventing e2e tests only against nightly and fix service export tests (#1046) * fix(e2e): Run eventing e2e tests only against master * fix(e2e): [service export] Service links are disabled by default see https://github.com/knative/serving/pull/9685 --- test/e2e/service_export_test.go | 9 ++++++--- test/presubmit-integration-tests-latest-release.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/e2e/service_export_test.go b/test/e2e/service_export_test.go index ae070f6e0..546267ab9 100644 --- a/test/e2e/service_export_test.go +++ b/test/e2e/service_export_test.go @@ -45,9 +45,10 @@ type expectedKNExportOption func(*clientv1alpha1.Export) type podSpecOption func(*corev1.PodSpec) func TestServiceExport(t *testing.T) { - //FIXME: enable once 0.18 is available - if strings.HasPrefix(os.Getenv("KNATIVE_SERVING_VERSION"), "0.17") { - t.Skip("The test is skipped on Serving version 0.17") + //FIXME: enable once 0.19 is available + // see: https://github.com/knative/serving/pull/9685 + if strings.HasPrefix(os.Getenv("KNATIVE_SERVING_VERSION"), "0.18") { + t.Skip("The test is skipped on Serving version 0.18") } t.Parallel() it, err := test.NewKnTest() @@ -502,6 +503,8 @@ func getPodSpecWithOptions(options ...podSpecOption) corev1.PodSpec { for _, fn := range options { fn(&spec) } + // Service links are disabled by default now see https://github.com/knative/serving/pull/9685 + spec.EnableServiceLinks = ptr.Bool(false) return spec } diff --git a/test/presubmit-integration-tests-latest-release.sh b/test/presubmit-integration-tests-latest-release.sh index b4d963483..e2d7a3995 100755 --- a/test/presubmit-integration-tests-latest-release.sh +++ b/test/presubmit-integration-tests-latest-release.sh @@ -18,6 +18,6 @@ # integration tests against Knative Serving / Eventing of a specific version. export KNATIVE_SERVING_VERSION="0.18.0" -export KNATIVE_EVENTING_VERSION="0.18.0" +#export KNATIVE_EVENTING_VERSION="0.18.0" $(dirname $0)/presubmit-tests.sh --integration-tests