diff --git a/.bettercodehub.yml b/.bettercodehub.yml index 1de4a1ee..b7b24308 100644 --- a/.bettercodehub.yml +++ b/.bettercodehub.yml @@ -3,4 +3,3 @@ languages: - go exclude: - /pkg/generated/.* -- /vendor/.* diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1f1497e..1feabf3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Shellcheck uses: reviewdog/action-shellcheck@v1 @@ -42,7 +42,7 @@ jobs: reporter: github-pr-review path: '.' pattern: '*.sh' - exclude: './.git/*,./vendor/*' + exclude: './.git/*' unit-test: # to ignore builds on release @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Unit test run: make test @@ -67,7 +67,7 @@ jobs: kubernetes: [v1.25.16] steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4 - name: Set up Go 1.19.13 uses: actions/setup-go@v4 @@ -108,7 +108,7 @@ jobs: needs: ['lint', 'unit-test', 'e2e-tests'] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set Image Org # sets the default IMAGE_ORG to openebs diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ebc86013..e9adcae2 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Shellcheck uses: reviewdog/action-shellcheck@v1 @@ -41,13 +41,12 @@ jobs: reporter: github-pr-review path: '.' pattern: '*.sh' - exclude: './vendor/*' unit-test: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Unit test run: make test @@ -64,7 +63,7 @@ jobs: kubernetes: [v1.25.16] steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4 - name: Set up Go 1.19.13 uses: actions/setup-go@v4 @@ -105,7 +104,7 @@ jobs: needs: ['lint', 'unit-test', 'e2e-tests'] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e71e2fde..1a2eefb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Set Image Org # sets the default IMAGE_ORG to openebs diff --git a/buildscripts/test-cov.sh b/buildscripts/test-cov.sh index f4b23f25..0f1206c4 100755 --- a/buildscripts/test-cov.sh +++ b/buildscripts/test-cov.sh @@ -17,7 +17,7 @@ set -e echo "" > coverage.txt -for d in $(go list ./... | grep -v 'vendor\|pkg/apis\|pkg/client\|tests'); do +for d in $(go list ./... | grep -v 'pkg/apis\|pkg/client\|tests'); do #TODO - Include -race while creating the coverage profile. go test -coverprofile=profile.out -covermode=atomic $d if [ -f profile.out ]; then diff --git a/buildscripts/test.sh b/buildscripts/test.sh index 5b1c0070..50e765c2 100755 --- a/buildscripts/test.sh +++ b/buildscripts/test.sh @@ -17,7 +17,7 @@ set -e # Create a temp dir and clean it up on exit -TEMPDIR=`mktemp -d -t csi-test.XXX` +TEMPDIR=$(mktemp -d -t csi-test.XXX) trap "rm -rf $TEMPDIR" EXIT HUP INT QUIT TERM # Build the Maya binary for the tests @@ -26,7 +26,7 @@ go build -o $TEMPDIR/maya || exit 1 # Run the tests echo "--> Running tests" -GOBIN="`which go`" +GOBIN="$(which go)" PATH=$TEMPDIR:$PATH \ $GOBIN test ${GOTEST_FLAGS:--cover -timeout=900s} $($GOBIN list ./... | grep -v 'pkg/apis\|pkg/generated\|tests') diff --git a/ci/ci-test.sh b/ci/ci-test.sh index 3619e05d..1f78d4bd 100755 --- a/ci/ci-test.sh +++ b/ci/ci-test.sh @@ -12,39 +12,40 @@ # See the License for the specific language governing permissions and # limitations under the License. +# shellcheck disable=SC1128 #!/usr/bin/env bash #OPENEBS_OPERATOR=https://raw.githubusercontent.com/openebs/openebs/HEAD/k8s/openebs-operator.yaml CSTOR_OPERATOR=https://raw.githubusercontent.com/openebs/cstor-operators/HEAD/deploy/cstor-operator.yaml -CSI_OPERATOR="$GOPATH/src/github.com/openebs/cstor-csi/deploy/csi-operator.yaml" -SNAPSHOT_CLASS="$GOPATH/src/github.com/openebs/cstor-csi/deploy/snapshot-class.yaml" +#CSI_OPERATOR="$GOPATH/src/github.com/openebs/cstor-csi/deploy/csi-operator.yaml" +#SNAPSHOT_CLASS="$GOPATH/src/github.com/openebs/cstor-csi/deploy/snapshot-class.yaml" #DST_PATH="$GOPATH/src/github.com/openebs" # Prepare env for runnging BDD tests # Minikube is already running -kubectl apply -f $CSTOR_RBAC -kubectl apply -f $NDM_OPERATOR -kubectl apply -f $ALL_CRD -kubectl apply -f $CSTOR_OPERATOR +# kubectl apply -f $CSTOR_RBAC +# kubectl apply -f $NDM_OPERATOR +# kubectl apply -f $ALL_CRD +kubectl apply -f "$CSTOR_OPERATOR" kubectl apply -f ./deploy/csi-operator.yaml kubectl apply -f ./deploy/snapshot-class.yaml function dumpCSINodeLogs() { LC=$1 CSINodePOD=$(kubectl get pods -l app=openebs-csi-node -o jsonpath='{.items[0].metadata.name}' -n kube-system) - kubectl describe po $CSINodePOD -n openebs + kubectl describe po "$CSINodePOD" -n openebs printf "\n\n" - kubectl logs --tail=${LC} $CSINodePOD -n openebs -c openebs-csi-plugin + kubectl logs --tail="${LC}" "$CSINodePOD" -n openebs -c openebs-csi-plugin printf "\n\n" } function dumpCSIControllerLogs() { LC=$1 CSIControllerPOD=$(kubectl get pods -l app=openebs-csi-controller -o jsonpath='{.items[0].metadata.name}' -n kube-system) - kubectl describe po $CSIControllerPOD -n openebs + kubectl describe po "$CSIControllerPOD" -n openebs printf "\n\n" - kubectl logs --tail=${LC} $CSIControllerPOD -n openebs -c openebs-csi-plugin + kubectl logs --tail="${LC}" "$CSIControllerPOD" -n openebs -c openebs-csi-plugin printf "\n\n" } @@ -53,9 +54,8 @@ kubectl wait --for=condition=Ready --timeout=300s pods/openebs-cstor-csi-control # Run e2e tests for csi volumes cd ./tests/e2e -make e2e-test -if [ $? -ne 0 ]; then +if ! make e2e-test; then echo "******************** CSI Controller logs***************************** " dumpCSIControllerLogs 1000