diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index bc7c5ac4e2..60a7c788cb 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -69,11 +69,11 @@ jobs: continue-on-error: false # Run the following integration tests after the build_minikube # They will run in parallel and use the binaries in previous step - functional_test_docker_ubuntu: + functional_docker_ubuntu: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "functional_test_docker_ubuntu" + JOB_NAME: "functional_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-18.04 @@ -147,9 +147,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: functional_test_docker_ubuntu + name: functional_docker_ubuntu path: minikube_binaries/report - - name: The End Result functional_test_docker_ubuntu + - name: The End Result functional_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -163,11 +163,11 @@ jobs: if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -lt 36 ];then echo "*** Failed to pass at least 36 ! ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** Passed! ***";exit 0;fi - functional_test_docker_windows: + functional_docker_windows: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "functional_test_docker_windows" + JOB_NAME: "functional_docker_windows" GOPOGH_RESULT: "" STAT: "" runs-on: [self-hosted, windows-10-ent, 8CPUs] @@ -260,9 +260,9 @@ jobs: echo "*** $numPass Passed ***" - uses: actions/upload-artifact@v1 with: - name: functional_test_docker_windows + name: functional_docker_windows path: minikube_binaries/report - - name: The End Result functional_test_docker_windows + - name: The End Result functional_docker_windows shell: powershell run: | $numFail=(echo $Env:STAT | jq '.NumberOfFail') @@ -276,11 +276,11 @@ jobs: If ($numPass -eq 0){ exit 2 } If ($numPass -lt 33){ exit 2 } If ($numFail -eq 0){ exit 0 } - functional_test_hyperv_windows: + functional_hyperv_windows: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "functional_test_hyperv_windows" + JOB_NAME: "functional_hyperv_windows" GOPOGH_RESULT: "" runs-on: [self-hosted, windows-10-ent, Standard_D16s_v3, hyperv] steps: @@ -360,7 +360,7 @@ jobs: echo "*** $numPass Passed ***" - uses: actions/upload-artifact@v1 with: - name: functional_test_hyperv_windows + name: functional_hyperv_windows path: minikube_binaries/report - name: Install tools continue-on-error: true @@ -371,7 +371,7 @@ jobs: choco install -y kubernetes-cli choco install -y jq if (Test-Path 'C:\Program Files\Docker\Docker\resources\bin\kubectl.exe') { Remove-Item 'C:\Program Files\Docker\Docker\resources\bin\kubectl.exe' }; - - name: The End Result functional_test_hyperv_windows + - name: The End Result functional_hyperv_windows shell: powershell run: | $numFail=(echo $Env:STAT | jq '.NumberOfFail') @@ -385,11 +385,11 @@ jobs: If ($numPass -eq 0){ exit 2 } If ($numPass -lt 33){ exit 2 } If ($numFail -eq 0){ exit 0 } - addons_certs_tests_docker_ubuntu: + addons_certs_docker_ubuntu: runs-on: ubuntu-18.04 env: TIME_ELAPSED: time - JOB_NAME: "addons_certs_tests_docker_ubuntu" + JOB_NAME: "addons_certs_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 needs: [build_minikube] @@ -463,9 +463,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: addons_certs_tests_docker_ubuntu + name: addons_certs_docker_ubuntu path: minikube_binaries/report - - name: The End Result - addons_certs_tests_docker_ubuntu + - name: The End Result - addons_certs_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -479,11 +479,11 @@ jobs: if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -lt 6 ];then echo "*** Failed to pass at least 6 ! ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** Passed! ***";exit 0;fi - multinode_pause_tests_docker_ubuntu: + multinode_pause_docker_ubuntu: runs-on: ubuntu-18.04 env: TIME_ELAPSED: time - JOB_NAME: "multinode_pause_tests_docker_ubuntu" + JOB_NAME: "multinode_pause_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 needs: [build_minikube] @@ -557,9 +557,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: multinode_pause_tests_docker_ubuntu + name: multinode_pause_docker_ubuntu path: minikube_binaries/report - - name: The End Result - multinode_pause_tests_docker_ubuntu + - name: The End Result - multinode_pause_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -573,11 +573,11 @@ jobs: if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -lt 6 ];then echo "*** Failed to pass at least 6 ! ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** Passed! ***";exit 0;fi - preload_docker_flags_tests_docker_ubuntu: + preload_docker_flags_docker_ubuntu: runs-on: ubuntu-18.04 env: TIME_ELAPSED: time - JOB_NAME: "preload_docker_flags_tests_docker_ubuntu" + JOB_NAME: "preload_docker_flags_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 needs: [build_minikube] @@ -651,9 +651,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: preload_docker_flags_tests_docker_ubuntu + name: preload_docker_flags_docker_ubuntu path: minikube_binaries/report - - name: The End Result - preload_docker_flags_tests_docker_ubuntu + - name: The End Result - preload_docker_flags_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -758,13 +758,13 @@ jobs: if: always() needs: [ - functional_test_docker_ubuntu, - addons_certs_tests_docker_ubuntu, - multinode_pause_tests_docker_ubuntu, - preload_docker_flags_tests_docker_ubuntu, + functional_docker_ubuntu, + addons_certs_docker_ubuntu, + multinode_pause_docker_ubuntu, + preload_docker_flags_docker_ubuntu, functional_baremetal_ubuntu18_04, - functional_test_docker_windows, - functional_test_hyperv_windows, + functional_docker_windows, + functional_hyperv_windows, ] runs-on: ubuntu-18.04 steps: @@ -776,13 +776,13 @@ jobs: run: | mkdir -p all_reports ls -lah - cp -r ./functional_test_docker_ubuntu ./all_reports/ - cp -r ./addons_certs_tests_docker_ubuntu ./all_reports/ - cp -r ./multinode_pause_tests_docker_ubuntu ./all_reports/ - cp -r ./preload_docker_flags_tests_docker_ubuntu ./all_reports/ + cp -r ./functional_docker_ubuntu ./all_reports/ + cp -r ./addons_certs_docker_ubuntu ./all_reports/ + cp -r ./multinode_pause_docker_ubuntu ./all_reports/ + cp -r ./preload_docker_flags_docker_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu18_04 ./all_reports/ - cp -r ./functional_test_docker_windows ./all_reports/ - cp -r ./functional_test_hyperv_windows ./all_reports/ + cp -r ./functional_docker_windows ./all_reports/ + cp -r ./functional_hyperv_windows ./all_reports/ - uses: actions/upload-artifact@v1 with: name: all_reports diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6df8fa5184..7cd0b3d036 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -18,12 +18,8 @@ jobs: run: go mod download - name: Build Binaries run: | - make minikube-linux-amd64 - make e2e-linux-amd64 - make windows - make e2e-windows-amd64.exe - make minikube-darwin-amd64 - make e2e-darwin-amd64 + make cross + make e2e-cross cp -r test/integration/testdata ./out whoami echo github ref $GITHUB_REF @@ -69,11 +65,11 @@ jobs: continue-on-error: false # Run the following integration tests after the build_minikube # They will run in parallel and use the binaries in previous step - functional_test_docker_ubuntu: + functional_docker_ubuntu: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "functional_test_docker_ubuntu" + JOB_NAME: "functional_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-18.04 @@ -147,9 +143,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: functional_test_docker_ubuntu + name: functional_docker_ubuntu path: minikube_binaries/report - - name: The End Result functional_test_docker_ubuntu + - name: The End Result functional_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -198,7 +194,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-amd64 -minikube-start-args=--vm-driver=virtualbox -test.run TestFunctional -test.timeout=13m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-amd64 -minikube-start-args=--vm-driver=virtualbox -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -236,11 +232,11 @@ jobs: if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -lt 33 ];then echo "*** Failed to pass at least 33 ! ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** Passed! ***";exit 0;fi - functional_test_docker_windows: + functional_docker_windows: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "functional_test_docker_windows" + JOB_NAME: "functional_docker_windows" GOPOGH_RESULT: "" STAT: "" runs-on: [self-hosted, windows-10-ent, 8CPUs] @@ -333,9 +329,9 @@ jobs: echo "*** $numPass Passed ***" - uses: actions/upload-artifact@v1 with: - name: functional_test_docker_windows + name: functional_docker_windows path: minikube_binaries/report - - name: The End Result functional_test_docker_windows + - name: The End Result functional_docker_windows shell: powershell run: | $numFail=(echo $Env:STAT | jq '.NumberOfFail') @@ -349,11 +345,11 @@ jobs: If ($numPass -eq 0){ exit 2 } If ($numPass -lt 33){ exit 2 } If ($numFail -eq 0){ exit 0 } - functional_test_hyperv_windows: + functional_hyperv_windows: needs: [build_minikube] env: TIME_ELAPSED: time - JOB_NAME: "functional_test_hyperv_windows" + JOB_NAME: "functional_hyperv_windows" GOPOGH_RESULT: "" runs-on: [self-hosted, windows-10-ent, Standard_D16s_v3, hyperv] steps: @@ -444,9 +440,9 @@ jobs: echo "*** $numPass Passed ***" - uses: actions/upload-artifact@v1 with: - name: functional_test_hyperv_windows + name: functional_hyperv_windows path: minikube_binaries/report - - name: The End Result functional_test_hyperv_windows + - name: The End Result functional_hyperv_windows shell: powershell run: | $numFail=(echo $Env:STAT | jq '.NumberOfFail') @@ -460,11 +456,11 @@ jobs: If ($numPass -eq 0){ exit 2 } If ($numPass -lt 33){ exit 2 } If ($numFail -eq 0){ exit 0 } - addons_certs_tests_docker_ubuntu: + addons_certs_docker_ubuntu: runs-on: ubuntu-18.04 env: TIME_ELAPSED: time - JOB_NAME: "addons_certs_tests_docker_ubuntu" + JOB_NAME: "addons_certs_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 needs: [build_minikube] @@ -538,9 +534,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: addons_certs_tests_docker_ubuntu + name: addons_certs_docker_ubuntu path: minikube_binaries/report - - name: The End Result - addons_certs_tests_docker_ubuntu + - name: The End Result - addons_certs_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -554,11 +550,11 @@ jobs: if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -lt 6 ];then echo "*** Failed to pass at least 6 ! ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** Passed! ***";exit 0;fi - multinode_pause_tests_docker_ubuntu: + multinode_pause_docker_ubuntu: runs-on: ubuntu-18.04 env: TIME_ELAPSED: time - JOB_NAME: "multinode_pause_tests_docker_ubuntu" + JOB_NAME: "multinode_pause_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 needs: [build_minikube] @@ -632,9 +628,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: multinode_pause_tests_docker_ubuntu + name: multinode_pause_docker_ubuntu path: minikube_binaries/report - - name: The End Result - multinode_pause_tests_docker_ubuntu + - name: The End Result - multinode_pause_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -648,11 +644,11 @@ jobs: if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -lt 6 ];then echo "*** Failed to pass at least 6 ! ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** Passed! ***";exit 0;fi - preload_docker_flags_tests_docker_ubuntu: + preload_docker_flags_docker_ubuntu: runs-on: ubuntu-18.04 env: TIME_ELAPSED: time - JOB_NAME: "preload_docker_flags_tests_docker_ubuntu" + JOB_NAME: "preload_docker_flags_docker_ubuntu" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 needs: [build_minikube] @@ -726,9 +722,9 @@ jobs: echo ::set-env name=STAT::${STAT} - uses: actions/upload-artifact@v1 with: - name: preload_docker_flags_tests_docker_ubuntu + name: preload_docker_flags_docker_ubuntu path: minikube_binaries/report - - name: The End Result - preload_docker_flags_tests_docker_ubuntu + - name: The End Result - preload_docker_flags_docker_ubuntu shell: bash run: | echo ${GOPOGH_RESULT} @@ -832,13 +828,13 @@ jobs: if: always() needs: [ - functional_test_docker_ubuntu, - addons_certs_tests_docker_ubuntu, - multinode_pause_tests_docker_ubuntu, - preload_docker_flags_tests_docker_ubuntu, + functional_docker_ubuntu, + addons_certs_docker_ubuntu, + multinode_pause_docker_ubuntu, + preload_docker_flags_docker_ubuntu, functional_baremetal_ubuntu18_04, - functional_test_docker_windows, - functional_test_hyperv_windows, + functional_docker_windows, + functional_hyperv_windows, functional_virtualbox_macos, ] runs-on: ubuntu-18.04 @@ -851,13 +847,13 @@ jobs: run: | mkdir -p all_reports ls -lah - cp -r ./functional_test_docker_ubuntu ./all_reports/ - cp -r ./addons_certs_tests_docker_ubuntu ./all_reports/ - cp -r ./multinode_pause_tests_docker_ubuntu ./all_reports/ - cp -r ./preload_docker_flags_tests_docker_ubuntu ./all_reports/ + cp -r ./functional_docker_ubuntu ./all_reports/ + cp -r ./addons_certs_docker_ubuntu ./all_reports/ + cp -r ./multinode_pause_docker_ubuntu ./all_reports/ + cp -r ./preload_docker_flags_docker_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu18_04 ./all_reports/ - cp -r ./functional_test_docker_windows ./all_reports/ - cp -r ./functional_test_hyperv_windows ./all_reports/ + cp -r ./functional_docker_windows ./all_reports/ + cp -r ./functional_hyperv_windows ./all_reports/ cp -r ./functional_virtualbox_macos ./all_reports/ - uses: actions/upload-artifact@v1 with: diff --git a/go.sum b/go.sum index e7877277c8..4c6192c672 100644 --- a/go.sum +++ b/go.sum @@ -693,6 +693,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGi github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=