Skip to content

Commit b2806f5

Browse files
furykerryfurykerry
committed
dump rollout logs if e2e fail
Signed-off-by: 守辰 <shouchen.zz@alibaba-inc.com>
1 parent 885497f commit b2806f5

29 files changed

+104
-284
lines changed

‎.github/workflows/e2e-advanced-deployment-1.24.yaml‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -95,39 +95,27 @@ jobs:
9595
echo "Timeout to wait for kruise-rollout ready"
9696
exit 1
9797
fi
98-
- name: Run E2E Tests For Deployment Controller
98+
- name: Run E2E Tests For Advance Deployment
9999
run: |
100100
export KUBECONFIG=/home/runner/.kube/config
101101
make ginkgo
102102
set +e
103103
./bin/ginkgo -timeout 60m -v --focus='Advanced Deployment' test/e2e
104104
retVal=$?
105-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
106-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
107-
if [ "${restartCount}" -eq "0" ];then
108-
echo "Kruise-rollout has not restarted"
109-
else
110-
kubectl get pod -n kruise-rollout --no-headers
111-
echo "Kruise-rollout has restarted, abort!!!"
112-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
113-
exit 1
105+
if [ "${retVal}" -ne 0 ];then
106+
echo "test fail, dump kruise-rollout logs"
107+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
114108
fi
115109
exit $retVal
116-
- name: Run E2E Tests For Control Plane
110+
- name: Run E2E Tests For Canary rollout of Advance Deployment
117111
run: |
118112
export KUBECONFIG=/home/runner/.kube/config
119113
make ginkgo
120114
set +e
121-
./bin/ginkgo -timeout 60m -v --focus='Advanced Deployment canary rollout with Ingress' test/e2e
115+
./bin/ginkgo -timeout 60m -v --focus='Canary rollout with Ingress using advance deployment' test/e2e
122116
retVal=$?
123-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
124-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
125-
if [ "${restartCount}" -eq "0" ];then
126-
echo "Kruise-rollout has not restarted"
127-
else
128-
kubectl get pod -n kruise-rollout --no-headers
129-
echo "Kruise-rollout has restarted, abort!!!"
130-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
131-
exit 1
117+
if [ "${retVal}" -ne 0 ];then
118+
echo "test fail, dump kruise-rollout logs"
119+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
132120
fi
133121
exit $retVal

‎.github/workflows/e2e-advanced-deployment-1.26.yaml‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -102,32 +102,20 @@ jobs:
102102
set +e
103103
./bin/ginkgo -timeout 60m -v --focus='Advanced Deployment' test/e2e
104104
retVal=$?
105-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
106-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
107-
if [ "${restartCount}" -eq "0" ];then
108-
echo "Kruise-rollout has not restarted"
109-
else
110-
kubectl get pod -n kruise-rollout --no-headers
111-
echo "Kruise-rollout has restarted, abort!!!"
112-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
113-
exit 1
105+
if [ "${retVal}" -ne 0 ];then
106+
echo "test fail, dump kruise-rollout logs"
107+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
114108
fi
115109
exit $retVal
116-
- name: Run E2E Tests For Control Plane
110+
- name: Run E2E Tests For Canary rollout of Advance Deployment
117111
run: |
118112
export KUBECONFIG=/home/runner/.kube/config
119113
make ginkgo
120114
set +e
121-
./bin/ginkgo -timeout 60m -v --focus='Advanced Deployment canary rollout with Ingress' test/e2e
115+
./bin/ginkgo -timeout 60m -v --focus='Canary rollout with Ingress using advance deployment' test/e2e
122116
retVal=$?
123-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
124-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
125-
if [ "${restartCount}" -eq "0" ];then
126-
echo "Kruise-rollout has not restarted"
127-
else
128-
kubectl get pod -n kruise-rollout --no-headers
129-
echo "Kruise-rollout has restarted, abort!!!"
130-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
131-
exit 1
117+
if [ "${retVal}" -ne 0 ];then
118+
echo "test fail, dump kruise-rollout logs"
119+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
132120
fi
133121
exit $retVal

‎.github/workflows/e2e-advanced-deployment-1.28.yaml‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -102,32 +102,20 @@ jobs:
102102
set +e
103103
./bin/ginkgo -timeout 60m -v --focus='Advanced Deployment' test/e2e
104104
retVal=$?
105-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
106-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
107-
if [ "${restartCount}" -eq "0" ];then
108-
echo "Kruise-rollout has not restarted"
109-
else
110-
kubectl get pod -n kruise-rollout --no-headers
111-
echo "Kruise-rollout has restarted, abort!!!"
112-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
113-
exit 1
105+
if [ "${retVal}" -ne 0 ];then
106+
echo "test fail, dump kruise-rollout logs"
107+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
114108
fi
115109
exit $retVal
116-
- name: Run E2E Tests For Control Plane
110+
- name: Run E2E Tests For Canary rollout of Advance Deployment
117111
run: |
118112
export KUBECONFIG=/home/runner/.kube/config
119113
make ginkgo
120114
set +e
121-
./bin/ginkgo -timeout 60m -v --focus='Advanced Deployment canary rollout with Ingress' test/e2e
115+
./bin/ginkgo -timeout 60m -v --focus='Canary rollout with Ingress using advance deployment' test/e2e
122116
retVal=$?
123-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
124-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
125-
if [ "${restartCount}" -eq "0" ];then
126-
echo "Kruise-rollout has not restarted"
127-
else
128-
kubectl get pod -n kruise-rollout --no-headers
129-
echo "Kruise-rollout has restarted, abort!!!"
130-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
131-
exit 1
117+
if [ "${retVal}" -ne 0 ];then
118+
echo "test fail, dump kruise-rollout logs"
119+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
132120
fi
133-
exit $retVal
121+
exit $retVal

‎.github/workflows/e2e-cloneset-1.24.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,8 @@ jobs:
102102
set +e
103103
./bin/ginkgo -timeout 60m -v --focus='CloneSet canary rollout with Ingress' test/e2e
104104
retVal=$?
105-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
106-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
107-
if [ "${restartCount}" -eq "0" ];then
108-
echo "Kruise-rollout has not restarted"
109-
else
110-
kubectl get pod -n kruise-rollout --no-headers
111-
echo "Kruise-rollout has restarted, abort!!!"
112-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
113-
exit 1
105+
if [ "${retVal}" -ne 0 ];then
106+
echo "test fail, dump kruise-rollout logs"
107+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
114108
fi
115109
exit $retVal

‎.github/workflows/e2e-cloneset-1.26.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,8 @@ jobs:
101101
set +e
102102
./bin/ginkgo -timeout 60m -v --focus='CloneSet canary rollout with Ingress' test/e2e
103103
retVal=$?
104-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
105-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
106-
if [ "${restartCount}" -eq "0" ];then
107-
echo "Kruise-rollout has not restarted"
108-
else
109-
kubectl get pod -n kruise-rollout --no-headers
110-
echo "Kruise-rollout has restarted, abort!!!"
111-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
112-
exit 1
104+
if [ "${retVal}" -ne 0 ];then
105+
echo "test fail, dump kruise-rollout logs"
106+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
113107
fi
114108
exit $retVal

‎.github/workflows/e2e-cloneset-1.28.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,8 @@ jobs:
102102
set +e
103103
./bin/ginkgo -timeout 60m -v --focus='CloneSet canary rollout with Ingress' test/e2e
104104
retVal=$?
105-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
106-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
107-
if [ "${restartCount}" -eq "0" ];then
108-
echo "Kruise-rollout has not restarted"
109-
else
110-
kubectl get pod -n kruise-rollout --no-headers
111-
echo "Kruise-rollout has restarted, abort!!!"
112-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
113-
exit 1
105+
if [ "${retVal}" -ne 0 ];then
106+
echo "test fail, dump kruise-rollout logs"
107+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
114108
fi
115109
exit $retVal

‎.github/workflows/e2e-custom.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,8 @@ jobs:
7777
set +e
7878
./bin/ginkgo -timeout 60m -v --focus='Canary rollout with custom network provider' test/e2e
7979
retVal=$?
80-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
81-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
82-
if [ "${restartCount}" -eq "0" ];then
83-
echo "Kruise-rollout has not restarted"
84-
else
85-
kubectl get pod -n kruise-rollout --no-headers
86-
echo "Kruise-rollout has restarted, abort!!!"
87-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
88-
exit 1
80+
if [ "${retVal}" -ne 0 ];then
81+
echo "test fail, dump kruise-rollout logs"
82+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
8983
fi
9084
exit $retVal

‎.github/workflows/e2e-daemonset-1.24.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,8 @@ jobs:
102102
set +e
103103
./bin/ginkgo -timeout 60m -v --focus='DaemonSet canary rollout' test/e2e
104104
retVal=$?
105-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
106-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
107-
if [ "${restartCount}" -eq "0" ];then
108-
echo "Kruise-rollout has not restarted"
109-
else
110-
kubectl get pod -n kruise-rollout --no-headers
111-
echo "Kruise-rollout has restarted, abort!!!"
112-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
113-
exit 1
105+
if [ "${retVal}" -ne 0 ];then
106+
echo "test fail, dump kruise-rollout logs"
107+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
114108
fi
115109
exit $retVal

‎.github/workflows/e2e-daemonset-1.26.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,8 @@ jobs:
101101
set +e
102102
./bin/ginkgo -timeout 60m -v --focus='DaemonSet canary rollout' test/e2e
103103
retVal=$?
104-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
105-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
106-
if [ "${restartCount}" -eq "0" ];then
107-
echo "Kruise-rollout has not restarted"
108-
else
109-
kubectl get pod -n kruise-rollout --no-headers
110-
echo "Kruise-rollout has restarted, abort!!!"
111-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
112-
exit 1
104+
if [ "${retVal}" -ne 0 ];then
105+
echo "test fail, dump kruise-rollout logs"
106+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
113107
fi
114108
exit $retVal

‎.github/workflows/e2e-daemonset-1.28.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,8 @@ jobs:
102102
set +e
103103
./bin/ginkgo -timeout 60m -v --focus='DaemonSet canary rollout' test/e2e
104104
retVal=$?
105-
# kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
106-
restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
107-
if [ "${restartCount}" -eq "0" ];then
108-
echo "Kruise-rollout has not restarted"
109-
else
110-
kubectl get pod -n kruise-rollout --no-headers
111-
echo "Kruise-rollout has restarted, abort!!!"
112-
kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
113-
exit 1
105+
if [ "${retVal}" -ne 0 ];then
106+
echo "test fail, dump kruise-rollout logs"
107+
kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
114108
fi
115109
exit $retVal

0 commit comments

Comments
 (0)