From 687a89369828833ae47fdd3e086fc182625430fd Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Fri, 18 Jun 2021 10:22:09 +0900 Subject: [PATCH 1/2] Use DomainMapping test with --customdomain option DomainMapping test needs two domain like: - original-ksvc.serverless.devcluster.openshift.com - mydomain.example.com We have a wildcard DNS for `*.serverless.devcluster.openshift.com` but cannot prepare for DNS the second domain `mydomain.example.com` so we used spoof client for the mydomain.example.com. But if we changed the second domain to `mydomain.serverless.devcluster.openshift.com`, it should work. Hence this patch changes to use `--customdomain` option. --- test/serving.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/serving.bash b/test/serving.bash index 7b4c2e0b28..591149cb25 100644 --- a/test/serving.bash +++ b/test/serving.bash @@ -49,6 +49,7 @@ function upstream_knative_serving_e2e_and_conformance_tests { --patch='{"spec": {"config": { "autoscaler": {"allow-zero-initial-scale": "true"}}}}' image_template="registry.ci.openshift.org/openshift/knative-${KNATIVE_SERVING_VERSION}:knative-serving-test-{{.Name}}" + subdomain=$(oc get ingresses.config.openshift.io cluster -o jsonpath="{.spec.domain}") local parallel=3 @@ -62,6 +63,7 @@ function upstream_knative_serving_e2e_and_conformance_tests { ./test/e2e ./test/conformance/api/... ./test/conformance/runtime/... \ --resolvabledomain --kubeconfig "$KUBECONFIG" \ --imagetemplate "$image_template" \ + --customdomain="$subdomain" --enable-beta \ --enable-alpha From 89ce900bc53f27bef0087a49ac39ab329ec43c38 Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Fri, 18 Jun 2021 15:40:48 +0900 Subject: [PATCH 2/2] Addd backslash --- test/serving.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/serving.bash b/test/serving.bash index 591149cb25..213bebdea3 100644 --- a/test/serving.bash +++ b/test/serving.bash @@ -63,7 +63,7 @@ function upstream_knative_serving_e2e_and_conformance_tests { ./test/e2e ./test/conformance/api/... ./test/conformance/runtime/... \ --resolvabledomain --kubeconfig "$KUBECONFIG" \ --imagetemplate "$image_template" \ - --customdomain="$subdomain" + --customdomain="$subdomain" \ --enable-beta \ --enable-alpha