From 025eb5e48e018fc1c1a5aa8c41076b22020ef11c Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 26 Oct 2020 16:56:49 -0700 Subject: [PATCH] permanently remove pause test from ubuntu gh action --- .github/workflows/master.yml | 16 ++++++++-------- .github/workflows/pr.yml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1347c0c81e..a28574be13 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -1021,11 +1021,11 @@ jobs: if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -lt 7 ];then echo "*** Failed to pass at least 7 ! ***";exit 2;fi - pause_preload_dockerflags_docker_ubuntu: + preload_dockerflags_docker_ubuntu: runs-on: ubuntu-18.04 env: TIME_ELAPSED: time - JOB_NAME: "pause_preload_dockerflags_docker_ubuntu" + JOB_NAME: "preload_dockerflags_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 needs: [build_minikube] @@ -1076,7 +1076,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestPause|TestPreload|TestDockerFlags)" -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestPreload|TestDockerFlags)" -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -1098,9 +1098,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: pause_preload_dockerflags_docker_ubuntu + name: preload_dockerflags_docker_ubuntu path: minikube_binaries/report - - name: The End Result - pause_preload_dockerflags_docker_ubuntu + - name: The End Result - preload_dockerflags_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -1114,7 +1114,7 @@ jobs: echo "-------------------------------------------------------" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi - if [ "$numPass" -lt 9 ];then echo "*** Failed to pass at least 9 ! ***";exit 2;fi + if [ "$numPass" -lt 2 ];then echo "*** Failed to pass at least 2 ! ***";exit 2;fi pause_preload_dockerflags_virtualbox_macos: runs-on: macos-10.15 env: @@ -1220,7 +1220,7 @@ jobs: addons_certs_virtualbox_macos, multinode_docker_ubuntu, multinode_virtualbox_macos, - pause_preload_dockerflags_docker_ubuntu, + preload_dockerflags_docker_ubuntu, pause_preload_dockerflags_virtualbox_macos, ] runs-on: ubuntu-18.04 @@ -1242,7 +1242,7 @@ jobs: cp -r ./addons_certs_virtualbox_macos ./all_reports/ cp -r ./multinode_docker_ubuntu ./all_reports/ cp -r ./multinode_virtualbox_macos ./all_reports/ - cp -r ./pause_preload_dockerflags_docker_ubuntu ./all_reports/ + cp -r ./preload_dockerflags_docker_ubuntu ./all_reports/ cp -r ./pause_preload_dockerflags_virtualbox_macos ./all_reports/ - uses: actions/upload-artifact@v1 with: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e3327f038a..cc08684f96 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1019,11 +1019,11 @@ jobs: if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -lt 7 ];then echo "*** Failed to pass at least 7 ! ***";exit 2;fi - pause_preload_dockerflags_docker_ubuntu: + preload_dockerflags_docker_ubuntu: runs-on: ubuntu-18.04 env: TIME_ELAPSED: time - JOB_NAME: "pause_preload_dockerflags_docker_ubuntu" + JOB_NAME: "preload_dockerflags_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 needs: [build_minikube] @@ -1074,7 +1074,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestPause)" -test.timeout=20m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestDockerFlags|TestPreload)" -test.timeout=10m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -1096,9 +1096,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: pause_preload_dockerflags_docker_ubuntu + name: preload_dockerflags_docker_ubuntu path: minikube_binaries/report - - name: The End Result - pause_preload_dockerflags_docker_ubuntu + - name: The End Result - preload_dockerflags_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -1112,7 +1112,7 @@ jobs: echo "-------------------------------------------------------" if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi - if [ "$numPass" -lt 9 ];then echo "*** Failed to pass at least 9 ! ***";exit 2;fi + if [ "$numPass" -lt 2 ];then echo "*** Failed to pass at least 2 ! ***";exit 2;fi pause_preload_dockerflags_virtualbox_macos: runs-on: macos-10.15 env: @@ -1218,7 +1218,7 @@ jobs: addons_certs_virtualbox_macos, multinode_docker_ubuntu, multinode_virtualbox_macos, - pause_preload_dockerflags_docker_ubuntu, + preload_dockerflags_docker_ubuntu, pause_preload_dockerflags_virtualbox_macos, ] runs-on: ubuntu-18.04 @@ -1240,7 +1240,7 @@ jobs: cp -r ./addons_certs_virtualbox_macos ./all_reports/ cp -r ./multinode_docker_ubuntu ./all_reports/ cp -r ./multinode_virtualbox_macos ./all_reports/ - cp -r ./pause_preload_dockerflags_docker_ubuntu ./all_reports/ + cp -r ./preload_dockerflags_docker_ubuntu ./all_reports/ cp -r ./pause_preload_dockerflags_virtualbox_macos ./all_reports/ - uses: actions/upload-artifact@v1 with: