diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2024-01-17 15:19:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-17 15:19:27 +0800 |
| commit | a54550f57df19b5d55de24f45de27fc90799c59d (patch) | |
| tree | f47c9b660dff1484c1c68c950d25f161b2edec34 /tests/scripts | |
| parent | Merge pull request #5235 from WillardHu/mqtt-daemonset (diff) | |
| parent | add cri-ci (diff) | |
| download | kubeedge-a54550f57df19b5d55de24f45de27fc90799c59d.tar.gz | |
Merge pull request #5321 from luomengY/ci-cri
add cri-ci
Diffstat (limited to 'tests/scripts')
| -rwxr-xr-x | tests/scripts/execute.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/scripts/execute.sh b/tests/scripts/execute.sh index eade794a6..f1e075a23 100755 --- a/tests/scripts/execute.sh +++ b/tests/scripts/execute.sh @@ -16,7 +16,7 @@ set -e -workdir=`pwd` +workdir=$(pwd) cd $workdir curpath=$PWD @@ -26,13 +26,13 @@ GOPATH=${GOPATH:-$(go env GOPATH)} KIND_IMAGE=${1:-"kindest/node:v1.26.0"} compilemodule=$2 -which ginkgo &> /dev/null || ( - go install github.com/onsi/ginkgo/v2/ginkgo@latest - sudo cp $GOPATH/bin/ginkgo /usr/local/bin/ +which ginkgo &>/dev/null || ( + go install github.com/onsi/ginkgo/v2/ginkgo@latest + sudo cp $GOPATH/bin/ginkgo /usr/local/bin/ ) cleanup() { - bash ${curpath}/tests/scripts/cleanup.sh + bash ${curpath}/tests/scripts/cleanup.sh } cleanup @@ -43,12 +43,12 @@ sudo rm -rf ${curpath}/tests/e2e_keadm/e2e_keadm.test # Specify the module name to compile in below command bash -x ${curpath}/tests/scripts/compile.sh ${compilemodule} -ENABLE_DAEMON=true bash -x ${curpath}/hack/local-up-kubeedge.sh ${KIND_IMAGE}|| { - echo "failed to start cluster !!!" - exit 1 +ENABLE_DAEMON=true bash -x ${curpath}/hack/local-up-kubeedge.sh ${KIND_IMAGE} || { + echo "failed to start cluster !!!" + exit 1 } -:> /tmp/testcase.log +: >/tmp/testcase.log export GINKGO_TESTING_RESULT=0 |