From da566ad647c3ebe6cc285c5d474b9f6a1d0d9c3c Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 1 Mar 2019 07:50:05 -0500 Subject: [PATCH 1/2] Showcase conformance images options in the manifest The Dockerfile has a few more options, let's surface that in the manifest. Also use the same defaults in the manifest as the Dockerfile itself. Change-Id: Ib7419cf7999430db15f39ac414c80ee362fcda76 --- cluster/images/conformance/conformance-e2e.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cluster/images/conformance/conformance-e2e.yaml b/cluster/images/conformance/conformance-e2e.yaml index b12c4858483..833b437fcad 100644 --- a/cluster/images/conformance/conformance-e2e.yaml +++ b/cluster/images/conformance/conformance-e2e.yaml @@ -59,7 +59,13 @@ spec: imagePullPolicy: IfNotPresent env: - name: E2E_FOCUS - value: "Pods should be submitted and removed" + value: "\\[Conformance\\]" + - name: E2E_SKIP + value: "Alpha|\\[(Disruptive|Feature:[^\\]]+|Flaky)\\]" + - name: E2E_PROVIDER + value: "local" + - name: E2E_PARALLEL + value: "y" volumeMounts: - name: output-volume mountPath: /tmp/results From 388a345efca248413be2be9bc1f8ebf34d5fee5d Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Fri, 1 Mar 2019 16:35:27 -0800 Subject: [PATCH 2/2] Use no skip regex for conformance --- cluster/images/conformance/conformance-e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/images/conformance/conformance-e2e.yaml b/cluster/images/conformance/conformance-e2e.yaml index 833b437fcad..942e36a78e6 100644 --- a/cluster/images/conformance/conformance-e2e.yaml +++ b/cluster/images/conformance/conformance-e2e.yaml @@ -61,7 +61,7 @@ spec: - name: E2E_FOCUS value: "\\[Conformance\\]" - name: E2E_SKIP - value: "Alpha|\\[(Disruptive|Feature:[^\\]]+|Flaky)\\]" + value: "" - name: E2E_PROVIDER value: "local" - name: E2E_PARALLEL