From bb95ec0f68b7c5f815b9ca11df9af00781c1bc42 Mon Sep 17 00:00:00 2001
From: Kenichi Omichi <ken-oomichi@wx.jp.nec.com>
Date: Fri, 31 May 2019 22:14:51 +0000
Subject: [PATCH] Enable API operation log on conformance job

To verify all conformance tests call GA APIs only without alpha,
beta APIs, this enables API operation log on the conformance job.
One concern is this makes e2e.log huge. So to consider it, the
original size of e2e.log is 112,909[1] before applying this.

[1]: https://gcsweb.k8s.io/gcs/kubernetes-jenkins/pr-logs/pull/70639/pull-kubernetes-conformance-image-test/1116565046130905089/artifacts/
---
 cluster/images/conformance/Dockerfile           | 1 +
 cluster/images/conformance/conformance-e2e.yaml | 2 ++
 cluster/images/conformance/run_e2e.sh           | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cluster/images/conformance/Dockerfile b/cluster/images/conformance/Dockerfile
index 3c61d50aae4..5f12885fe7a 100644
--- a/cluster/images/conformance/Dockerfile
+++ b/cluster/images/conformance/Dockerfile
@@ -25,6 +25,7 @@ ENV E2E_FOCUS="\[Conformance\]"
 ENV E2E_SKIP=""
 ENV E2E_PROVIDER="local"
 ENV E2E_PARALLEL="1"
+ENV E2E_VERBOSITY="4"
 ENV RESULTS_DIR="/tmp/results"
 ENV KUBECONFIG=""
 
diff --git a/cluster/images/conformance/conformance-e2e.yaml b/cluster/images/conformance/conformance-e2e.yaml
index a492d621eb1..c290b61aac5 100644
--- a/cluster/images/conformance/conformance-e2e.yaml
+++ b/cluster/images/conformance/conformance-e2e.yaml
@@ -66,6 +66,8 @@ spec:
       value: "skeleton"
     - name: E2E_PARALLEL
       value: "false"
+    - name: E2E_VERBOSITY
+      value: "4"
     volumeMounts:
     - name: output-volume
       mountPath: /tmp/results
diff --git a/cluster/images/conformance/run_e2e.sh b/cluster/images/conformance/run_e2e.sh
index 5264a891264..afe8d207a40 100755
--- a/cluster/images/conformance/run_e2e.sh
+++ b/cluster/images/conformance/run_e2e.sh
@@ -59,7 +59,7 @@ ginkgo_args+=(
 )
 
 set -x
-/usr/local/bin/ginkgo "${ginkgo_args[@]}" /usr/local/bin/e2e.test -- --disable-log-dump --repo-root=/kubernetes --provider="${E2E_PROVIDER}" --report-dir="${RESULTS_DIR}" --kubeconfig="${KUBECONFIG}" | tee "${RESULTS_DIR}"/e2e.log &
+/usr/local/bin/ginkgo "${ginkgo_args[@]}" /usr/local/bin/e2e.test -- --disable-log-dump --repo-root=/kubernetes --provider="${E2E_PROVIDER}" --report-dir="${RESULTS_DIR}" --kubeconfig="${KUBECONFIG}" -v="${E2E_VERBOSITY}" | tee "${RESULTS_DIR}"/e2e.log &
 set +x
 # $! is the pid of tee, not ginkgo
 wait "$(pgrep ginkgo)" && ret=0 || ret=$?