Remove bincover

Signed-off-by: Shikhar Soni <[email protected]>
antrea-io · Mar 15, 2024 · baae5b5 · baae5b5
1 parent 0886d74
commit baae5b5
Show file tree

Hide file tree

Showing 28 changed files with 148 additions and 234 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,8 @@ bin
 .golangci-bin
 .coverage/
 .trivy-bin
-
+coverage/
+coverage-without-sigint/
 .DS_Store
 
 # VIM

diff --git a/Makefile b/Makefile
@@ -106,7 +106,7 @@ antrea-agent-simulator:
 .PHONY: antrea-agent-instr-binary
 antrea-agent-instr-binary:
 	@mkdir -p $(BINDIR)
-	GOOS=linux $(GO) test -tags testbincover -covermode count -coverpkg=antrea.io/antrea/pkg/... -c -o $(BINDIR)/antrea-agent-coverage $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/antrea-agent
+	GOOS=linux $(GO) build -cover -o $(BINDIR)/antrea-agent-coverage -coverpkg=antrea.io/antrea/cmd/antrea-agent,antrea.io/antrea/pkg/... $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/antrea-agent
 
 .PHONY: antrea-controller
 antrea-controller:
@@ -120,7 +120,7 @@ antrea-controller:
 .PHONY: antrea-controller-instr-binary
 antrea-controller-instr-binary:
 	@mkdir -p $(BINDIR)
-	GOOS=linux $(GO) test -tags testbincover -covermode count -coverpkg=antrea.io/antrea/pkg/... -c -o $(BINDIR)/antrea-controller-coverage $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/antrea-controller
+	GOOS=linux $(GO) build -cover -o $(BINDIR)/antrea-controller-coverage -coverpkg=antrea.io/antrea/cmd/antrea-controller,antrea.io/antrea/pkg/... $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/antrea-controller
 
 .PHONY: antrea-cni
 antrea-cni:
@@ -135,7 +135,7 @@ antrea-cni-release:
 .PHONY: antctl-instr-binary
 antctl-instr-binary:
 	@mkdir -p $(BINDIR)
-	GOOS=linux $(GO) test -tags testbincover -covermode count -coverpkg=antrea.io/antrea/pkg/... -c -o $(BINDIR)/antctl-coverage $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/antctl
+	GOOS=linux $(GO) build -cover -o $(BINDIR)/antctl-coverage -coverpkg=antrea.io/antrea/cmd/antctl,antrea.io/antrea/pkg/... $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/antctl
 
 .PHONY: windows-bin
 windows-bin:
@@ -150,7 +150,7 @@ flow-aggregator:
 .PHONY: flow-aggregator-instr-binary
 flow-aggregator-instr-binary:
 	@mkdir -p $(BINDIR)
-	GOOS=linux $(GO) test -tags testbincover -covermode count -coverpkg=antrea.io/antrea/pkg/... -c -o $(BINDIR)/flow-aggregator-coverage $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/flow-aggregator
+	GOOS=linux $(GO) build -cover -o $(BINDIR)/flow-aggregator-coverage -coverpkg=antrea.io/antrea/cmd/flow-aggregator,antrea.io/antrea/pkg/... $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/flow-aggregator
 
 .PHONY: test-unit test-integration
 ifeq ($(UNAME_S),Linux)

diff --git a/build/charts/antrea/templates/agent/daemonset.yaml b/build/charts/antrea/templates/agent/daemonset.yaml
@@ -97,6 +97,11 @@ spec:
             - name: {{ $k | quote }}
               value: {{ $v | quote }}
             {{- end }}
+            # If coverage is enabled, provide coverage directory variable needed by Go 
+            {{- if ((.Values.testing).coverage) }}
+            - name: GOCOVERDIR
+              value: /tmp/coverage
+            {{- end }}
             # SKIP_CNI_BINARIES takes in values as a comma separated list of
             # binaries that need to be skipped for installation, e.g. "portmap, bandwidth".
             - name: SKIP_CNI_BINARIES
@@ -130,8 +135,15 @@ spec:
           image: {{ include "antreaAgentImage" . | quote }}
           imagePullPolicy: {{ include "antreaAgentImagePullPolicy" . }}
           {{- if ((.Values.testing).coverage) }}
-          command: ["/bin/sh"]
-          args: ["-c", "sleep 2; antrea-agent-coverage -test.run=TestBincoverRunMain -test.coverprofile=antrea-agent.cov.out -args-file=/agent-arg-file; while true; do sleep 5 & wait $!; done"]
+          args:
+            - "antrea-agent-coverage"
+            - "--config=/etc/antrea/antrea-agent.conf"
+            - "--logtostderr=false"
+            - "--log_dir=/var/log/antrea"
+            - "--alsologtostderr"
+            - "--log_file_max_size=100"
+            - "--log_file_max_num=4"
+            - "--v=4"
           {{- else}}
           command: ["antrea-agent"]
           # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).-
@@ -163,6 +175,11 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            # If coverage is enabled, provide coverage directory variable needed by Go 
+            {{- if ((.Values.testing).coverage) }}
+            - name: GOCOVERDIR
+              value: /tmp/coverage
+            {{- end }}
             {{- if eq .Values.trafficEncryptionMode "ipsec" }}
             # Pre-shared key for IPsec IKE.
             - name: ANTREA_IPSEC_PSK

diff --git a/build/charts/antrea/templates/controller/deployment.yaml b/build/charts/antrea/templates/controller/deployment.yaml
@@ -64,8 +64,15 @@ spec:
           imagePullPolicy: {{ include "antreaControllerImagePullPolicy" . }}
           resources: {{- .Values.controller.antreaController.resources | toYaml | nindent 12 }}
           {{- if ((.Values.testing).coverage) }}
-          command: ["/bin/sh"]
-          args: ["-c", "antrea-controller-coverage -test.run=TestBincoverRunMain -test.coverprofile=antrea-controller.cov.out -args-file=/controller-arg-file; while true; do sleep 5 & wait $!; done"]
+          args:
+            - "antrea-controller-coverage"
+            - "--config=/etc/antrea/antrea-controller.conf"
+            - "--logtostderr=false"
+            - "--log_dir=/var/log/antrea"
+            - "--alsologtostderr"
+            - "--log_file_max_size=100"
+            - "--log_file_max_num=4"
+            - "--v=4"
           {{- else }}
           command: ["antrea-controller"]
           # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).
@@ -85,6 +92,10 @@ spec:
           {{- end }}
           env:
             # Provide pod and node information for clusterinformation CRD.
+            {{- if ((.Values.testing).coverage) }}
+            - name: GOCOVERDIR
+              value: /tmp/coverage
+            {{- end }}
             - name: POD_NAME
               valueFrom:
                 fieldRef:

diff --git a/build/charts/flow-aggregator/templates/deployment.yaml b/build/charts/flow-aggregator/templates/deployment.yaml
@@ -28,9 +28,17 @@ spec:
         image: {{ include "flowAggregatorImage" . | quote }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         {{- if .Values.testing.coverage }}
-        command: [ "/bin/sh" ]
-        args: [ "-c", "flow-aggregator-coverage -test.run=TestBincoverRunMain -test.coverprofile=flow-aggregator.cov.out -args-file=/flow-aggregator-arg-file; while true; do sleep 5 & wait $!; done" ]
+        args:
+          - "flow-aggregator-coverage"
+          - "--config=/etc/antrea/flow-aggregator.conf"
+          - "--logtostderr=false"
+          - "--log_dir=/var/log/antrea"
+          - "--alsologtostderr"
+          - "--log_file_max_size=100"
+          - "--log_file_max_num=4"
+          - "--v=4"
         {{- else }}
+        command: [ "flow-aggregator" ]
         args:
         - --config
         - /etc/flow-aggregator/flow-aggregator.conf
@@ -44,6 +52,11 @@ spec:
         {{- end }}
         {{- end }}
         env:
+            # If coverage is enabled, provide coverage directory variable needed by Go 
+          {{- if ((.Values.testing).coverage) }}
+          - name: GOCOVERDIR
+            value: /tmp/coverage
+          {{- end }}
           - name: POD_NAME
             valueFrom:
               fieldRef:

diff --git a/build/images/Dockerfile.build.agent.coverage b/build/images/Dockerfile.build.agent.coverage
@@ -35,10 +35,13 @@ LABEL description="The Docker image to deploy the antrea-agent with code coverag
 
 USER root
 
+RUN mkdir -p /tmp/coverage
 COPY build/images/scripts/* /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/antrea-agent /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/antrea-agent-coverage /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/antrea-cni /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/antctl /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/antctl-coverage /usr/local/bin/
-COPY --from=antrea-build /antrea/test/e2e/coverage/agent-arg-file /
+COPY --from=antrea-build /antrea/test/e2e/utils/run_cov_binary.sh /
+
+ENTRYPOINT [ "/./run_cov_binary.sh" ]
diff --git a/build/images/Dockerfile.build.controller.coverage b/build/images/Dockerfile.build.controller.coverage
@@ -25,7 +25,6 @@ RUN go mod download
 COPY . /antrea
 
 RUN make antctl-linux antctl-instr-binary && mv bin/antctl-linux bin/antctl
-
 RUN make antrea-controller antrea-controller-instr-binary
 
 FROM ubuntu:22.04
@@ -35,8 +34,11 @@ LABEL description="The Docker image to deploy the antrea-controller with code co
 
 USER root
 
+RUN mkdir -p /tmp/coverage
 COPY --from=antrea-build /antrea/bin/antrea-controller /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/antctl /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/antrea-controller-coverage /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/antctl-coverage /usr/local/bin/
-COPY --from=antrea-build /antrea/test/e2e/coverage/controller-arg-file /
+COPY --from=antrea-build /antrea/test/e2e/utils/run_cov_binary.sh /
+
+ENTRYPOINT [ "/./run_cov_binary.sh" ]
diff --git a/build/images/Dockerfile.build.coverage b/build/images/Dockerfile.build.coverage
@@ -27,7 +27,6 @@ COPY . /antrea
 # Build antctl first in order to share an extra layer with
 # build/images/Dockerfile.build.agent.coverage and build/images/Dockerfile.build.controller.coverage.
 RUN make antctl-linux antctl-instr-binary && mv bin/antctl-linux bin/antctl
-
 # Then build antrea-agent and antrea-cni, in order to share an extra layer with
 # build/images/Dockerfile.build.agent.coverage.
 RUN make antrea-agent antrea-cni antrea-agent-instr-binary
@@ -41,7 +40,9 @@ LABEL description="The Docker image to deploy the Antrea CNI with code coverage
 
 USER root
 
+RUN mkdir -p /tmp/coverage
 COPY build/images/scripts/* /usr/local/bin/
 COPY --from=antrea-build /antrea/bin/* /usr/local/bin/
-COPY --from=antrea-build /antrea/test/e2e/coverage/controller-arg-file /
-COPY --from=antrea-build /antrea/test/e2e/coverage/agent-arg-file /
+COPY --from=antrea-build /antrea/test/e2e/utils/run_cov_binary.sh /
+
+ENTRYPOINT [ "/./run_cov_binary.sh" ]
diff --git a/build/images/flow-aggregator/Dockerfile.coverage b/build/images/flow-aggregator/Dockerfile.coverage
@@ -29,10 +29,13 @@ LABEL description="The docker image for the flow aggregator with code coverage m
 
 USER root
 
+RUN mkdir -p /tmp/coverage
 COPY --from=flow-aggregator-build /antrea/bin/flow-aggregator* /usr/local/bin/
-COPY --from=flow-aggregator-build /antrea/test/e2e/coverage/flow-aggregator-arg-file /
 COPY --from=flow-aggregator-build /antrea/bin/antctl* /usr/local/bin/
+COPY --from=antrea-build /antrea/test/e2e/utils/run_cov_binary.sh /
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends ca-certificates \
     && rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT [ "/./run_cov_binary.sh" ]
diff --git a/ci/kind/test-e2e-kind.sh b/ci/kind/test-e2e-kind.sh
@@ -367,6 +367,15 @@ function run_test {
   EXTRA_ARGS="$vlan_args --external-server-ips $(docker inspect external-server -f '{{.NetworkSettings.Networks.kind.IPAddress}},{{.NetworkSettings.Networks.kind.GlobalIPv6Address}}')"
 
   go test -v -timeout=$timeout $RUN_OPT antrea.io/antrea/test/e2e $flow_visibility_args -provider=kind --logs-export-dir=$ANTREA_LOG_DIR --skip-cases=$skiplist $coverage_args $EXTRA_ARGS
+
+  if $coverage; then
+    pushd $ANTREA_COV_DIR
+    for dir in */; do 
+      go tool covdata textfmt -i="${dir}" -o "${dir%?}_$(date +%Y-%m-%d_%H-%M-%S).cov.out"
+      rm -rf "${dir}"; 
+    done
+    popd
+  fi
 }
 
 if [[ "$mode" == "" ]] || [[ "$mode" == "encap" ]]; then

diff --git a/cmd/antctl/bincover_run_main_test.go b/cmd/antctl/bincover_run_main_test.go
diff --git a/cmd/antrea-agent/bincover_run_main_test.go b/cmd/antrea-agent/bincover_run_main_test.go
diff --git a/cmd/antrea-controller/bincover_run_main_test.go b/cmd/antrea-controller/bincover_run_main_test.go
diff --git a/cmd/flow-aggregator/bincover_run_main_test.go b/cmd/flow-aggregator/bincover_run_main_test.go
diff --git a/hack/git_client_side_hooks/pre-push b/hack/git_client_side_hooks/pre-push
@@ -39,7 +39,7 @@ do
       RANGE="$REMOTE_SHA..$LOCAL_SHA"
     fi
 
-    NOT_SIGNED_OFF=$(git rev-list --no-merges --author "$AUTHOR" --grep="^Signed-off-by: " --invert-grep "$RANGE")
+    NOT_SIGNED_OFF=$(git rev-list --no-merges --grep="^Signed-off-by: " --invert-grep "$RANGE")
     if [ -n "$NOT_SIGNED_OFF" ]
     then
       echo >&2 "ERROR: The following commits have no DCO sign-off:"

diff --git a/multicluster/Makefile b/multicluster/Makefile
@@ -82,7 +82,7 @@ bin: fmt vet ## Build manager binary.
 
 .PHONY: antrea-mc-instr-binary
 antrea-mc-instr-binary:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go test -tags testbincover -covermode count -coverpkg=antrea.io/antrea/multicluster/... -c -o bin/antrea-mc-controller-coverage antrea.io/antrea/multicluster/cmd/...
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -cover -coverpkg=antrea.io/antrea/multicluster/...,antrea.io/antrea/multicluster/cmd/... -o bin/antrea-mc-controller-coverage1 antrea.io/antrea/multicluster/cmd/...
 
 run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./main.go

diff --git a/multicluster/build/images/Dockerfile.build.coverage b/multicluster/build/images/Dockerfile.build.coverage
@@ -32,4 +32,9 @@ LABEL description="The Docker image to deploy the Antrea Multi-cluster Controlle
 
 USER root
 
+RUN mkdir -p /tmp/coverage
 COPY --from=antrea-build /antrea/multicluster/bin/antrea-mc-controller-coverage /
+COPY --from=antrea-build /antrea/test/e2e/utils/run_cov_binary.sh /
+
+ENTRYPOINT [ "/./run_cov_binary.sh" ]
+