From fc8fd7bf273b27fdc197c1bffd65a1fb72d54a90 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 25 Nov 2020 15:17:54 -0800
Subject: [PATCH 1/2] Update conformance tests for multinode testing:

---
 hack/conformance_tests.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hack/conformance_tests.sh b/hack/conformance_tests.sh
index b4509e8e9c..cec198a741 100755
--- a/hack/conformance_tests.sh
+++ b/hack/conformance_tests.sh
@@ -27,19 +27,21 @@ set -ex -o pipefail
 readonly PROFILE_NAME="k8sconformance"
 readonly MINIKUBE=${1:-./out/minikube}
 shift || true
+readonly START_ARGS=${@:-}
 
 # Requires a fully running Kubernetes cluster.
 "${MINIKUBE}" delete -p "${PROFILE_NAME}" || true
-"${MINIKUBE}" start -p "${PROFILE_NAME}" --wait=all
+"${MINIKUBE}" start -p "${PROFILE_NAME}" ${START_ARGS} --wait=all --nodes=2
 kubectl --context "${PROFILE_NAME}" get pods --all-namespaces
 "${MINIKUBE}" status -p "${PROFILE_NAME}"
 
-go get -u -v github.com/vmware-tanzu/sonobuoy
+curl -LO https://github.com/vmware-tanzu/sonobuoy/releases/download/v0.19.0/sonobuoy_0.19.0_linux_amd64.tar.gz || true
+tar -xzf sonobuoy_0.19.0_linux_amd64.tar.gz
 
 
-sonobuoy run --wait
+./sonobuoy run --mode=certified-conformance --wait --alsologtostderr
 outdir="$(mktemp -d)"
-sonobuoy retrieve "${outdir}"
+./sonobuoy retrieve "${outdir}"
 
 cwd=$(pwd)
 

From 22a99c55cd73cb26cada21dd2e272b24a1b8ac0e Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 25 Nov 2020 17:48:37 -0800
Subject: [PATCH 2/2] small fixes

---
 hack/conformance_tests.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hack/conformance_tests.sh b/hack/conformance_tests.sh
index cec198a741..439649449f 100755
--- a/hack/conformance_tests.sh
+++ b/hack/conformance_tests.sh
@@ -48,9 +48,9 @@ cwd=$(pwd)
 cd "${outdir}"
 mkdir ./results; tar xzf *.tar.gz -C ./results
 
-version=$(${MINIKUBE} version  | cut -d" " -f3)
+version=$(${cwd}/${MINIKUBE} version  | cut -d" " -f3)
 
-mkdir "minikube-${version}"
+mkdir -p "minikube-${version}"
 cd "minikube-${version}"
 
 cat <<EOF >PRODUCT.yaml
@@ -69,6 +69,6 @@ cat <<EOF >README.md
 ./hack/conformance_tests.sh $MINIKUBE $START_ARGS
 EOF
 
-cp ../results/plugins/e2e/results/* .
+cp -r ../results/plugins/e2e/results/global/* .
 cd ..
 cp -r "minikube-${version}" "${cwd}"