From 21d9940b9d13257699291e516166ee02df1a45d2 Mon Sep 17 00:00:00 2001
From: Mengxin Liu <mengxin@alauda.io>
Date: Fri, 5 Feb 2021 10:32:13 +0800
Subject: [PATCH] ci: update kind version and set timeout

---
 .github/workflows/build-x86-image.yaml | 3 +++
 Makefile                               | 8 ++++----
 docs/kubectl-plugin.md                 | 2 +-
 test/e2e/ip/static_ip.go               | 9 ++++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
index 07e39519c43..1bdc542357e 100644
--- a/.github/workflows/build-x86-image.yaml
+++ b/.github/workflows/build-x86-image.yaml
@@ -77,6 +77,7 @@ jobs:
     needs: build
     name: 1-master-e2e
     runs-on: ubuntu-18.04
+    timeout-minutes: 30
     steps:
       - name: Check out code
         uses: actions/checkout@v2
@@ -123,6 +124,7 @@ jobs:
     needs: build
     name: 3-master-e2e
     runs-on: ubuntu-18.04
+    timeout-minutes: 30
     steps:
       - name: Check out code
         uses: actions/checkout@v2
@@ -170,6 +172,7 @@ jobs:
     needs: build
     name: ipv6-e2e
     runs-on: ubuntu-18.04
+    timeout-minutes: 30
     steps:
       - name: Check out code
         uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index 98263c82925..293e6efe00f 100644
--- a/Makefile
+++ b/Makefile
@@ -127,12 +127,12 @@ uninstall:
 	bash dist/images/cleanup.sh
 
 e2e:
-	docker pull nginx:alpine
-	kind load docker-image --name kube-ovn nginx:alpine
-	ginkgo -p --slowSpecThreshold=60 test/e2e
+	docker pull kubeovn/pause:3.2
+	kind load docker-image --name kube-ovn kubeovn/pause:3.2
+	ginkgo -progress -reportPassed --slowSpecThreshold=60 test/e2e
 
 ut:
-	ginkgo -p --slowSpecThreshold=60 test/unittest
+	ginkgo -progress -reportPassed --slowSpecThreshold=60 test/unittest
 
 scan:
 	trivy image --light --exit-code=1 --severity=HIGH --ignore-unfixed kubeovn/kube-ovn:${RELEASE_TAG}
diff --git a/docs/kubectl-plugin.md b/docs/kubectl-plugin.md
index 66c2253a753..0663b5e475b 100644
--- a/docs/kubectl-plugin.md
+++ b/docs/kubectl-plugin.md
@@ -8,7 +8,7 @@ To enable kubectl plugin, kubectl version of 1.12 or later is recommended. You c
 
 1. Get the `kubectl-ko` file
 ```bash
-wget https://raw.githubusercontent.com/alauda/kube-ovn/v1.1.0/dist/images/kubectl-ko
+wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/kubectl-ko
 ```
 
 2. Move the file to one of $PATH directories
diff --git a/test/e2e/ip/static_ip.go b/test/e2e/ip/static_ip.go
index 412bbad2665..3e28439dbb5 100644
--- a/test/e2e/ip/static_ip.go
+++ b/test/e2e/ip/static_ip.go
@@ -16,6 +16,9 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 )
 
+const (
+	TestImage =  "kubeovn/pause:3.2"
+)
 var _ = Describe("[IP Allocation]", func() {
 	namespace := "static-ip"
 	f := framework.NewFramework("ip allocation", fmt.Sprintf("%s/.kube/config", os.Getenv("HOME")))
@@ -37,7 +40,7 @@ var _ = Describe("[IP Allocation]", func() {
 					Containers: []corev1.Container{
 						{
 							Name:            name,
-							Image:           "nginx:alpine",
+							Image:           TestImage,
 							ImagePullPolicy: corev1.PullIfNotPresent,
 						},
 					},
@@ -87,7 +90,7 @@ var _ = Describe("[IP Allocation]", func() {
 							Containers: []corev1.Container{
 								{
 									Name:            name,
-									Image:           "nginx:alpine",
+									Image:           TestImage,
 									ImagePullPolicy: corev1.PullIfNotPresent,
 								},
 							},
@@ -159,7 +162,7 @@ var _ = Describe("[IP Allocation]", func() {
 							Containers: []corev1.Container{
 								{
 									Name:            name,
-									Image:           "nginx:alpine",
+									Image:           TestImage,
 									ImagePullPolicy: corev1.PullIfNotPresent,
 								},
 							},