From fe0063ec164f7ed1f660dad411e8a977d0846e3c Mon Sep 17 00:00:00 2001
From: Zhenyu Zheng <zheng.zhenyu@outlook.com>
Date: Fri, 28 Jun 2019 14:28:49 +0800
Subject: [PATCH] Refactor KinD on ARM job

Refactor KinD on ARM job
---
 .../kind-integration-test-arm64/run.yaml      | 65 +++++++------------
 1 file changed, 22 insertions(+), 43 deletions(-)

diff --git a/playbooks/kind-integration-test-arm64/run.yaml b/playbooks/kind-integration-test-arm64/run.yaml
index 8268af7b6..9dd4cc990 100644
--- a/playbooks/kind-integration-test-arm64/run.yaml
+++ b/playbooks/kind-integration-test-arm64/run.yaml
@@ -3,66 +3,45 @@
   become: yes
   roles:
     - role: config-golang
-      go_version: 1.12.1
+      go_version: 1.12.6
       arch: arm64
     - role: install-docker-ce
       arch: arm64
-    #- role: andrewrothstein.bazel
-    #  bazel_ver: '0.23.1'
 
   tasks:
-    - name: git required repositories
-      shell:
-        cmd: |
-          GO111MODULE="on" go get sigs.k8s.io/kind@master
-          go get k8s.io/kubeadm
-          go get k8s.io/kubernetes
-          go get k8s.io/test-infra/kubetest
-        executable: /bin/bash
-      environment: '{{ global_env }}'
-    - name: build KIND against k/k master using bazel
-      shell:
-        cmd: |
-          # As suggested  in https://github.com/kubernetes-sigs/kind/issues/532
-          # we downloaded KinD's dependancies from go111module as a walkaround,
-          # thus the code is not in the original path, we add a soft link to
-          # it and comment out some of previous code, we can restore it once
-          # the issue has been fixed.
-          mkdir -p $GOPATH/src/sigs.k8s.io/
-          kind_tmp=`ls -d $GOPATH/pkg/mod/sigs.k8s.io/kind*`
-          ln -sf $kind_tmp $GOPATH/src/sigs.k8s.io/kind
-          chmod +x $GOPATH/src/sigs.k8s.io/kind/images/base/entrypoint
-          # cd $GOPATH/src/sigs.k8s.io/kind && go install .
-          kind build base-image --image kindest/base:latest --source $GOPATH/src/sigs.k8s.io/kind/images/base --loglevel debug
-        executable: /bin/bash
-      environment: '{{ global_env }}'
 
     - name: Create e2e directory for testgrid
       file:
         path: '{{ k8s_log_dir }}'
         state: directory
 
-    - name: run with kubetest
+    - name: Run e2e tests
       shell:
         cmd: |
           export LOG_DIR='{{ k8s_log_dir }}'
           # Add a walk-around start time to the e2e.log file to make the
           # upload step running
           date +"%b %e %H:%M:%S.999: START " | tee $LOG_DIR/e2e.log
+          go get k8s.io/kubernetes
+          go get k8s.io/kubeadm
+          go get k8s.io/test-infra/kubetest
+          # Install Kind@Master
+          mkdir -p $GOPATH/src/sigs.k8s.io/
+          mv '{{ zuul.project.src_dir }}' $GOPATH/src/sigs.k8s.io/
+          cd $GOPATH/src/sigs.k8s.io/kind && go mod download go.mod
+          # walk-arounds to make e2e.sh be able to run on AArch64, will
+          # be removed once fix has been merged in KinD
+          sed -i \
+            '/kind build node-image/i\    kind build base-image --image kindest/base:latest --source $GOPATH/src/sigs.k8s.io/kind/images/base' \
+            $GOPATH/src/sigs.k8s.io/kind/hack/ci/e2e.sh
+          sed -i \
+            's#kind build node-image#kind build node-image --base-image kindest/base:latest#' \
+            $GOPATH/src/sigs.k8s.io/kind/hack/ci/e2e.sh
+          go install .
           cd $GOPATH/src/k8s.io/test-infra/kubetest && go install .
-          cd $GOPATH/src/k8s.io/kubernetes && kubetest \
-            --provider=skeleton \
-            --deployment=kind \
-            --kind-binary-version=build \
-            --kind-base-image="kindest/base:latest" \
-            --kind-config-path=./../../k8s.io/kubeadm/tests/e2e/kind/single-cp/single-cp.yaml \
-            --build=bazel \
-            --up \
-            --test \
-            --check-version-skew=false \
-            --down \
-            --test_args="--ginkgo.focus=\[Conformance\] --ginkgo.skip=\[Serial\]|Alpha|Kubectl|\[(Disruptive|Feature:[^\]]+|Flaky)\] --num-nodes=3" \
-            --timeout=240m | tee -a $LOG_DIR/e2e.log
-            cp -R $GOPATH/src/k8s.io/kubernetes/_artifacts/* $LOG_DIR
+          # Checkout K8S to v1.14.3 and run tests
+          cd $GOPATH/src/k8s.io/kubernetes && git checkout v1.14.3
+          $GOPATH/src/sigs.k8s.io/kind/hack/ci/e2e.sh | tee -a $LOG_DIR/e2e.log
+          cp -R $GOPATH/src/k8s.io/kubernetes/_artifacts/* $LOG_DIR
         executable: /bin/bash
       environment: '{{ global_env }}'