Merge pull request #2972 from kolyshkin/fix-ci

CI: fix GHA CI not running unit tests in cmd

Author: bobbypage

.github/workflows/test.yml

@@ -24,7 +24,9 @@ jobs:
     - name: Run tests
       env:
         GOLANG_VERSION: ${{ matrix.go-versions }}
-      run: source ${{ matrix.environment-variables }} && make docker-test
+      run: |
+        source ${{ matrix.environment-variables }}
+        make test
   test-integration:
     strategy:
       matrix:
@@ -36,15 +38,11 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
-        path: go/src/github.com/google/cadvisor
     - name: Run integration tests
       env:
         GOLANG_VERSION: ${{ matrix.go-versions }}
       run: |
         set -ex
-        cd $GITHUB_WORKSPACE/go/src/github.com/google/cadvisor
         source ${{ matrix.environment-variables }}
         make docker-test-integration
     - name: Upload cAdvisor log file

Makefile

@@ -14,8 +14,7 @@
 
 GO := go
 GOLANGCI_VER := v1.42.1
-pkgs     = $(shell $(GO) list ./... | grep -v vendor)
-cmd_pkgs = $(shell cd cmd && $(GO) list ./... | grep -v vendor)
+GO_TEST ?= $(GO) test $(or $(GO_FLAGS),-race)
 arch ?= $(shell go env GOARCH)
 
 ifeq ($(arch), amd64)
@@ -29,13 +28,12 @@ all: presubmit build test
 
 test:
 	@echo ">> running tests"
-	@$(GO) test -short -race $(pkgs)
-	@cd cmd && $(GO) test -short -race $(cmd_pkgs)
+	@# Filter out integration.
+	$(GO) list ./... | grep -vw integration | xargs $(GO_TEST)
+	cd cmd && $(GO_TEST) ./...
 
-test-with-libpfm:
-	@echo ">> running tests"
-	@$(GO) test -short -race -tags="libpfm" $(pkgs)
-	@cd cmd && $(GO) test -short -race -tags="libpfm" $(cmd_pkgs)
+test-with-libpfm: GO_FLAGS=-race -tags libpfm
+test-with-libpfm: test
 
 container-test:
 	@echo ">> runinng tests in a container"
@@ -45,9 +43,9 @@ docker-test: container-test
 	@echo "docker-test target is deprecated, use container-test instead"
 
 test-integration:
-	@GO_FLAGS=${$GO_FLAGS:-"-race"} ./build/build.sh
-	go test -c github.com/google/cadvisor/integration/tests/api
-	go test -c github.com/google/cadvisor/integration/tests/healthz
+	GO_FLAGS=$(or $(GO_FLAGS),-race) ./build/build.sh
+	$(GO_TEST) -c github.com/google/cadvisor/integration/tests/api
+	$(GO_TEST) -c github.com/google/cadvisor/integration/tests/healthz
 	@./build/integration.sh
 
 docker-test-integration:

build/unit-in-container.sh

@@ -14,32 +14,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -e
+set -ex
 
-CONTAINER_ENGINE=$(command -v docker || true)
-if [ "$CONTAINER_ENGINE" == "" ]; then
-  CONTAINER_ENGINE=$(command -v podman || true)
-fi
-if [ "$CONTAINER_ENGINE" == "" ]; then
-  echo "Unable to find docker and podman. Exiting."
+if ! CONTAINER_ENGINE=$(command -v docker || command -v podman); then
+  echo "Neither docker nor podman found. Exiting."
   exit 1
 fi
 
 function run_tests() {
-  BUILD_CMD="go test $GO_FLAGS $(go list $GO_FLAGS ./... | grep -v 'vendor\|integration' | tr '\n' ' ') && \
-    cd cmd && go test $GO_FLAGS $(go list $GO_FLAGS ./... | grep -v 'vendor\|integration' | tr '\n' ' ')"
+  BUILD_CMD="make test"
   if [ "$BUILD_PACKAGES" != "" ]; then
-    BUILD_CMD="echo 'deb http://deb.debian.org/debian buster-backports main'>/etc/apt/sources.list.d/buster.list && \
-    apt update && \
-    apt install -y -t buster-backports $BUILD_PACKAGES && \
+    BUILD_CMD="echo 'deb http://deb.debian.org/debian buster-backports main'>/etc/apt/sources.list.d/buster.list
+    apt update
+    apt install -y -t buster-backports $BUILD_PACKAGES
     $BUILD_CMD"
   fi
 
   $CONTAINER_ENGINE run --rm \
     -w /go/src/github.com/google/cadvisor \
     -v ${PWD}:/go/src/github.com/google/cadvisor \
+    -e GO_FLAGS \
     golang:${GOLANG_VERSION} \
-    bash -c "$BUILD_CMD"
+    bash -e -c "$BUILD_CMD"
 }
 
 GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}