From 8bfa9c9e532c3ad97421cd8b6a46819977d27b74 Mon Sep 17 00:00:00 2001 From: niulechuan <81207605+niulechuan@users.noreply.github.com> Date: Fri, 1 Apr 2022 18:02:22 +0800 Subject: [PATCH 1/5] Secert envs will inject into systemd service directly (#84) --- .github/workflows/pr.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 641fad18..89d04017 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -27,9 +27,4 @@ jobs: with: fetch-depth: 0 - name: e2e-test - env: - GOVC_USERNAME: ${{ secrets.GOVC_USERNAME }} - GOVC_PASSWORD: ${{ secrets.GOVC_PASSWORD }} - GOVC_URL: ${{ secrets.GOVC_URL }} - GOVC_DATACENTER: ${{ secrets.GOVC_DATACENTER }} run: make e2e-test From 299ef76830185ff228f92c5378b9232c2918a9b1 Mon Sep 17 00:00:00 2001 From: A_tian <76234281+FloatXD@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:04:16 +0800 Subject: [PATCH 2/5] Deleted the account password in the script (#78) * Deleted the account password in the script * e2e-fix-17-1 * e2e-fix-17-2 * e2e-fix-17-3 * e2e-fix-17-4 * e2e-fix-17-4 * e2e-fix-17-5 * e2e-fix-17-6 * e2e-fix-17-7 * e2e-fix-17-8 Co-authored-by: 123 <123> --- test/e2e-test.sh | 5 ----- test/e2e/SmokeTest/lsVolume.go | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/test/e2e-test.sh b/test/e2e-test.sh index ae84cd4f..d79aa32a 100644 --- a/test/e2e-test.sh +++ b/test/e2e-test.sh @@ -2,10 +2,6 @@ # simple scripts mng machine # link hosts export GOVC_INSECURE=1 -export GOVC_USERNAME="panyintian.fu@daocloud.io" -export GOVC_PASSWORD="rcZa9FY6EiwnYk8!" -export GOVC_URL="https://192.168.1.136:443" -export GOVC_DATACENTER="DaoCloud-NDX-Fusion" export GOVC_RESOURCE_POOL="e2e" export hosts="fupan-e2e-k8s-master fupan-e2e-k8s-node1 fupan-e2e-k8s-node2" export snapshot="e2etest" @@ -17,7 +13,6 @@ export snapshot="e2etest" # govc find . -type m -runtime.powerState poweredOn # govc find . -type m -runtime.powerState poweredOn | xargs govc vm.info # govc vm.info $hosts - set -e for h in $hosts; do if [[ `govc vm.info $h | grep poweredOn | wc -l` -eq 1 ]]; then diff --git a/test/e2e/SmokeTest/lsVolume.go b/test/e2e/SmokeTest/lsVolume.go index 2430d7b6..11ab2751 100644 --- a/test/e2e/SmokeTest/lsVolume.go +++ b/test/e2e/SmokeTest/lsVolume.go @@ -22,7 +22,7 @@ import ( "time" ) -var _ = ginkgo.Describe("test localstorage volume ", ginkgo.Label("smokeTest"), func() { +var _ = ginkgo.Describe("test localstorage volume ", ginkgo.Label("smokeTest"), func() { f := framework.NewDefaultFramework(apis.AddToScheme) client := f.GetClient() From c9cba9f70dfac8ec566b2067f14c37e558658beb Mon Sep 17 00:00:00 2001 From: niulechuan Date: Thu, 7 Apr 2022 14:42:49 +0800 Subject: [PATCH 3/5] add codecov --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 80d080e0..5674c499 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,9 @@ clean: docker rmi -f $(shell docker images -f dangling=true -qa) unit-test: - bash test/unit-test.sh + go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... + bash <(curl -s https://codecov.io/bash) +# bash test/unit-test.sh e2e-test: bash test/e2e-test.sh From 3bcee618d96711c0d780b7dae20c891432c57402 Mon Sep 17 00:00:00 2001 From: niulechuan Date: Thu, 7 Apr 2022 14:47:13 +0800 Subject: [PATCH 4/5] name --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5674c499..19420b7a 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ clean: unit-test: go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... - bash <(curl -s https://codecov.io/bash) + bash curl -s https://codecov.io/bash # bash test/unit-test.sh e2e-test: From d3688099ad34ef3e658c41b5f7cc56875397b4ad Mon Sep 17 00:00:00 2001 From: niulechuan Date: Thu, 7 Apr 2022 14:50:08 +0800 Subject: [PATCH 5/5] name --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 19420b7a..a7ef9f85 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,9 @@ clean: unit-test: go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... - bash curl -s https://codecov.io/bash + curl -Os https://uploader.codecov.io/latest/linux/codecov + chmod +x codecov + ./codecov # bash test/unit-test.sh e2e-test: