From 4765040aa36fc7a4239c4a44b866bfafa0fea304 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 27 Aug 2022 15:05:22 +0200 Subject: [PATCH 1/7] ci: gha test workflow for integration and unit test Signed-off-by: CrazyMax (cherry picked from commit 2e04be3fb92085d49854cc680a2b686ff726dd15) --- .github/actions/setup-runner/action.yml | 27 +++ .github/workflows/test.yml | 268 ++++++++++++++++++++++++ Makefile | 10 +- docker-bake.hcl | 21 ++ 4 files changed, 325 insertions(+), 1 deletion(-) create mode 100644 .github/actions/setup-runner/action.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/actions/setup-runner/action.yml b/.github/actions/setup-runner/action.yml new file mode 100644 index 0000000000..d9e5211c23 --- /dev/null +++ b/.github/actions/setup-runner/action.yml @@ -0,0 +1,27 @@ +name: 'Setup Runner' +description: 'Composite action to set up the GitHub Runner for jobs in the test.yml workflow' + +runs: + using: composite + steps: + - run: | + sudo modprobe ip_vs + sudo modprobe ipv6 + sudo modprobe ip6table_filter + sudo modprobe -r overlay + sudo modprobe overlay redirect_dir=off + shell: bash + - run: | + if [ ! -e /etc/docker/daemon.json ]; then + echo '{}' | tee /etc/docker/daemon.json >/dev/null + fi + DOCKERD_CONFIG=$(jq '.+{"experimental":true,"live-restore":true,"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' /etc/docker/daemon.json) + sudo tee /etc/docker/daemon.json <<<"$DOCKERD_CONFIG" >/dev/null + sudo service docker restart + shell: bash + - run: | + ./contrib/check-config.sh || true + shell: bash + - run: | + docker info + shell: bash diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000000..e6408a3719 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,268 @@ +name: test + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +on: + workflow_dispatch: + push: + branches: + - 'master' + - '[0-9]+.[0-9]{2}' + tags: + - 'v*' + pull_request: + +env: + GO_VERSION: 1.19.1 + GOTESTLIST_VERSION: v0.2.0 + ITG_CLI_MATRIX_SIZE: 6 + BUILDX: docker buildx + USE_BUILDX: 1 + DOCKER_EXPERIMENTAL: 1 + DOCKER_GRAPHDRIVER: overlay2 + +jobs: + build-dev: + runs-on: ubuntu-20.04 + strategy: + fail-fast: false + matrix: + mode: + - "" + - systemd + steps: + - + name: Prepare + run: | + if [ "${{ matrix.mode }}" = "systemd" ]; then + echo "SYSTEMD=true" >> $GITHUB_ENV + fi + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Build dev image + uses: docker/bake-action@v2 + with: + targets: dev + set: | + *.cache-from=type=gha,scope=dev${{ matrix.mode }} + *.cache-to=type=gha,scope=dev${{ matrix.mode }},mode=max + *.output=type=cacheonly + + unit: + runs-on: ubuntu-20.04 + needs: + - build-dev + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up runner + uses: ./.github/actions/setup-runner + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Build dev image + uses: docker/bake-action@v2 + with: + targets: dev + set: | + dev.cache-from=type=gha,scope=dev + - + name: Test + run: | + make -o build test-unit + + docker-py: + runs-on: ubuntu-20.04 + needs: + - build-dev + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up runner + uses: ./.github/actions/setup-runner + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Build dev image + uses: docker/bake-action@v2 + with: + targets: dev + set: | + dev.cache-from=type=gha,scope=dev + - + name: Test + run: | + make -o build test-docker-py + - + name: Test daemon logs + if: always() + run: | + cat bundles/test-docker-py/docker.log + + integration-flaky: + runs-on: ubuntu-20.04 + needs: + - build-dev + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up runner + uses: ./.github/actions/setup-runner + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Build dev image + uses: docker/bake-action@v2 + with: + targets: dev + set: | + dev.cache-from=type=gha,scope=dev + - + name: Test + run: | + make -o build test-integration-flaky + env: + TEST_SKIP_INTEGRATION_CLI: 1 + + integration: + runs-on: ${{ matrix.os }} + needs: + - build-dev + strategy: + fail-fast: false + matrix: + os: + - ubuntu-20.04 + - ubuntu-22.04 + mode: + - "" + - rootless + - systemd + #- rootless-systemd FIXME: https://github.com/moby/moby/issues/44084 + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up runner + uses: ./.github/actions/setup-runner + - + name: Prepare + run: | + CACHE_DEV_SCOPE=dev + if [[ "${{ matrix.mode }}" == *"rootless"* ]]; then + echo "DOCKER_ROOTLESS=1" >> $GITHUB_ENV + fi + if [[ "${{ matrix.mode }}" == *"systemd"* ]]; then + echo "SYSTEMD=true" >> $GITHUB_ENV + CACHE_DEV_SCOPE="${CACHE_DEV_SCOPE}systemd" + fi + echo "CACHE_DEV_SCOPE=${CACHE_DEV_SCOPE}" >> $GITHUB_ENV + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Build dev image + uses: docker/bake-action@v2 + with: + targets: dev + set: | + dev.cache-from=type=gha,scope=${{ env.CACHE_DEV_SCOPE }} + - + name: Test + run: | + make -o build test-integration + env: + TEST_SKIP_INTEGRATION_CLI: 1 + - + name: Test daemon logs + if: always() + run: | + cat bundles/test-integration/docker.log + + integration-cli-prepare: + runs-on: ubuntu-20.04 + outputs: + matrix: ${{ steps.tests.outputs.matrix }} + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: ${{ env.GO_VERSION }} + - + name: Install gotestlist + run: + go install github.com/crazy-max/gotestlist/cmd/gotestlist@${{ env.GOTESTLIST_VERSION }} + - + name: Create matrix + id: tests + working-directory: ./integration-cli + run: | + # Distribute integration-cli tests for the matrix in integration-test job. + # Also prepend ./... to the matrix. This is a special case to run "Test integration" step exclusively. + matrix="$(gotestlist -d ${{ env.ITG_CLI_MATRIX_SIZE }} ./...)" + matrix="$(echo "$matrix" | jq -c '. |= ["./..."] + .')" + echo "::set-output name=matrix::$matrix" + - + name: Show matrix + run: | + echo ${{ steps.tests.outputs.matrix }} + + integration-cli: + runs-on: ubuntu-20.04 + needs: + - build-dev + - integration-cli-prepare + strategy: + fail-fast: false + matrix: + test: ${{ fromJson(needs.integration-cli-prepare.outputs.matrix) }} + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up runner + uses: ./.github/actions/setup-runner + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Build dev image + uses: docker/bake-action@v2 + with: + targets: dev + set: | + dev.cache-from=type=gha,scope=dev + - + name: Test + run: | + make -o build test-integration + env: + TEST_SKIP_INTEGRATION: 1 + TESTFLAGS: "-test.run (${{ matrix.test }})/" + - + name: Test daemon logs + if: always() + run: | + cat bundles/test-integration/docker.log diff --git a/Makefile b/Makefile index 4d21efe28f..ddad782563 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ DOCKER_IMAGE := docker-dev DOCKER_PORT_FORWARD := $(if $(DOCKER_PORT),-p "$(DOCKER_PORT)",) DELVE_PORT_FORWARD := $(if $(DELVE_PORT),-p "$(DELVE_PORT)",) -DOCKER_FLAGS := $(DOCKER) run --rm -i --privileged $(DOCKER_CONTAINER_NAME) $(DOCKER_ENVS) $(DOCKER_MOUNT) $(DOCKER_PORT_FORWARD) $(DELVE_PORT_FORWARD) +DOCKER_FLAGS := $(DOCKER) run --rm --privileged $(DOCKER_CONTAINER_NAME) $(DOCKER_ENVS) $(DOCKER_MOUNT) $(DOCKER_PORT_FORWARD) $(DELVE_PORT_FORWARD) BUILD_APT_MIRROR := $(if $(DOCKER_BUILD_APT_MIRROR),--build-arg APT_MIRROR=$(DOCKER_BUILD_APT_MIRROR)) export BUILD_APT_MIRROR @@ -137,6 +137,14 @@ ifeq ($(INTERACTIVE), 1) DOCKER_FLAGS += -t endif +# on GitHub Runners input device is not a TTY but we allocate a pseudo-one, +# otherwise keep STDIN open even if not attached if not a GitHub Runner. +ifeq ($(GITHUB_ACTIONS),true) + DOCKER_FLAGS += -t +else + DOCKER_FLAGS += -i +endif + DOCKER_RUN_DOCKER := $(DOCKER_FLAGS) "$(DOCKER_IMAGE)" DOCKER_BUILD_ARGS += --build-arg=GO_VERSION diff --git a/docker-bake.hcl b/docker-bake.hcl index e05fbec4cf..42aebeff4f 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -35,3 +35,24 @@ target "cross" { } target = "cross" } + +# +# dev +# + +variable "DEV_IMAGE" { + default = "docker-dev" +} +variable "SYSTEMD" { + default = "false" +} + +target "dev" { + inherits = ["_common"] + target = "final" + args = { + SYSTEMD = SYSTEMD + } + tags = [DEV_IMAGE] + output = ["type=docker"] +} From 0bfb1bded349088d378476c38304847209bd8296 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 30 Aug 2022 13:34:30 +0200 Subject: [PATCH 2/7] integration: TestNetworkLoopbackNat is broken on GitHub Runner Signed-off-by: CrazyMax (cherry picked from commit df731c745a53ff7f5db06e0baa0ebe73a3db235f) --- Makefile | 1 + hack/make/.integration-test-helpers | 1 + integration/container/nat_test.go | 1 + 3 files changed, 3 insertions(+) diff --git a/Makefile b/Makefile index ddad782563..d5a9be0da0 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ DOCKER_ENVS := \ -e DOCKER_USERLANDPROXY \ -e DOCKERD_ARGS \ -e DELVE_PORT \ + -e GITHUB_ACTIONS \ -e TEST_FORCE_VALIDATE \ -e TEST_INTEGRATION_DIR \ -e TEST_SKIP_INTEGRATION \ diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers index b8b4896ef4..87614fea03 100644 --- a/hack/make/.integration-test-helpers +++ b/hack/make/.integration-test-helpers @@ -150,6 +150,7 @@ test_env() { DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \ DOCKER_ROOTLESS="$DOCKER_ROOTLESS" \ DOCKERFILE="$DOCKERFILE" \ + GITHUB_ACTIONS="$GITHUB_ACTIONS" \ GOCACHE="$GOCACHE" \ GOPATH="$GOPATH" \ GOTRACEBACK=all \ diff --git a/integration/container/nat_test.go b/integration/container/nat_test.go index 5567e01ab3..c94e5a556e 100644 --- a/integration/container/nat_test.go +++ b/integration/container/nat_test.go @@ -56,6 +56,7 @@ func TestNetworkLocalhostTCPNat(t *testing.T) { } func TestNetworkLoopbackNat(t *testing.T) { + skip.If(t, testEnv.GitHubActions, "FIXME: https://github.com/moby/moby/issues/41561") skip.If(t, testEnv.OSType == "windows", "FIXME") skip.If(t, testEnv.IsRemoteDaemon) From 874954d8bd8a61c1da26913b44e9559b6d0a5489 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Thu, 25 Aug 2022 15:36:00 +0200 Subject: [PATCH 3/7] integration-cli: TestEventsOOM* broken on GitHub Runner Signed-off-by: CrazyMax (cherry picked from commit b8bf60c590191625b21698ad6ee9e995cb98905c) --- integration-cli/docker_cli_events_unix_test.go | 3 +++ integration-cli/requirements_test.go | 4 ++++ testutil/environment/environment.go | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_events_unix_test.go b/integration-cli/docker_cli_events_unix_test.go index 81076845d1..6848bcca84 100644 --- a/integration-cli/docker_cli_events_unix_test.go +++ b/integration-cli/docker_cli_events_unix_test.go @@ -19,6 +19,7 @@ import ( "golang.org/x/sys/unix" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/skip" ) // #5979 @@ -50,6 +51,7 @@ func (s *DockerCLIEventSuite) TestEventsRedirectStdout(c *testing.T) { func (s *DockerCLIEventSuite) TestEventsOOMDisableFalse(c *testing.T) { testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, swapMemorySupport, NotPpc64le) + skip.If(c, GitHubActions, "FIXME: https://github.com/moby/moby/pull/36541") errChan := make(chan error, 1) go func() { @@ -80,6 +82,7 @@ func (s *DockerCLIEventSuite) TestEventsOOMDisableFalse(c *testing.T) { func (s *DockerCLIEventSuite) TestEventsOOMDisableTrue(c *testing.T) { testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotArm, swapMemorySupport, NotPpc64le) + skip.If(c, GitHubActions, "FIXME: https://github.com/moby/moby/pull/36541") errChan := make(chan error, 1) observer, err := newEventObserver(c) diff --git a/integration-cli/requirements_test.go b/integration-cli/requirements_test.go index 3c4e194781..30f6207e2f 100644 --- a/integration-cli/requirements_test.go +++ b/integration-cli/requirements_test.go @@ -68,6 +68,10 @@ func UnixCli() bool { return isUnixCli } +func GitHubActions() bool { + return os.Getenv("GITHUB_ACTIONS") != "" +} + func Network() bool { // Set a timeout on the GET at 15s const timeout = 15 * time.Second diff --git a/testutil/environment/environment.go b/testutil/environment/environment.go index 88a9a7cf27..9f1b9eb472 100644 --- a/testutil/environment/environment.go +++ b/testutil/environment/environment.go @@ -224,5 +224,5 @@ func EnsureFrozenImagesLinux(testEnv *Execution) error { // GitHubActions is true if test is executed on a GitHub Runner. func (e *Execution) GitHubActions() bool { - return os.Getenv("GITHUB_ACTIONS") == "true" + return os.Getenv("GITHUB_ACTIONS") != "" } From fc2942d4e075ac26e1a988b188220da78811f7ad Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Thu, 25 Aug 2022 15:19:15 +0200 Subject: [PATCH 4/7] integration-cli: TestPluginInstallImage broken on GitHub Runner Signed-off-by: CrazyMax (cherry picked from commit 60864229b8d2ca373c588562c41156c55266f41f) --- integration-cli/docker_cli_plugins_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index 8e6912fd1c..f5c9206665 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -17,6 +17,7 @@ import ( "github.com/docker/docker/integration-cli/daemon" "github.com/docker/docker/testutil/fixtures/plugin" "gotest.tools/v3/assert" + "gotest.tools/v3/skip" ) var ( @@ -220,6 +221,7 @@ func (ps *DockerPluginSuite) TestPluginInstallArgs(c *testing.T) { func (ps *DockerPluginSuite) TestPluginInstallImage(c *testing.T) { testRequires(c, IsAmd64) + skip.If(c, GitHubActions, "FIXME: https://github.com/moby/moby/issues/43996") repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL) // tag the image to upload it to the private registry From 8ca74127d922219cd2e9ce4d3b0e55f7a1592e88 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Wed, 31 Aug 2022 14:11:22 +0200 Subject: [PATCH 5/7] ci(test): upload reports Signed-off-by: CrazyMax (cherry picked from commit 4c8af0e2f9d4e975ad98c77c8556cd23687a8a8d) --- .github/workflows/test.yml | 70 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6408a3719..b72f4adba7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -80,6 +80,22 @@ jobs: name: Test run: | make -o build test-unit + - + name: Prepare reports + if: always() + run: | + mkdir -p bundles /tmp/reports + find bundles -path '*/root/*overlay2' -prune -o -type f \( -name '*-report.json' -o -name '*.log' -o -name '*.out' -o -name '*.prof' -o -name '*-report.xml' \) -print | xargs sudo tar -czf /tmp/reports.tar.gz + tar -xzf /tmp/reports.tar.gz -C /tmp/reports + sudo chown -R $(id -u):$(id -g) /tmp/reports + tree -nh /tmp/reports + - + name: Upload reports + if: always() + uses: actions/upload-artifact@v3 + with: + name: unit-reports + path: /tmp/reports/* docker-py: runs-on: ubuntu-20.04 @@ -106,11 +122,27 @@ jobs: name: Test run: | make -o build test-docker-py + - + name: Prepare reports + if: always() + run: | + mkdir -p bundles /tmp/reports + find bundles -path '*/root/*overlay2' -prune -o -type f \( -name '*-report.json' -o -name '*.log' -o -name '*.out' -o -name '*.prof' -o -name '*-report.xml' \) -print | xargs sudo tar -czf /tmp/reports.tar.gz + tar -xzf /tmp/reports.tar.gz -C /tmp/reports + sudo chown -R $(id -u):$(id -g) /tmp/reports + tree -nh /tmp/reports - name: Test daemon logs if: always() run: | cat bundles/test-docker-py/docker.log + - + name: Upload reports + if: always() + uses: actions/upload-artifact@v3 + with: + name: docker-py-reports + path: /tmp/reports/* integration-flaky: runs-on: ubuntu-20.04 @@ -190,11 +222,31 @@ jobs: make -o build test-integration env: TEST_SKIP_INTEGRATION_CLI: 1 + - + name: Prepare reports + if: always() + run: | + reportsPath="/tmp/reports/${{ matrix.os }}" + if [ -n "${{ matrix.mode }}" ]; then + reportsPath="$reportsPath-${{ matrix.mode }}" + fi + mkdir -p bundles $reportsPath + find bundles -path '*/root/*overlay2' -prune -o -type f \( -name '*-report.json' -o -name '*.log' -o -name '*.out' -o -name '*.prof' -o -name '*-report.xml' \) -print | xargs sudo tar -czf /tmp/reports.tar.gz + tar -xzf /tmp/reports.tar.gz -C $reportsPath + sudo chown -R $(id -u):$(id -g) $reportsPath + tree -nh $reportsPath - name: Test daemon logs if: always() run: | cat bundles/test-integration/docker.log + - + name: Upload reports + if: always() + uses: actions/upload-artifact@v3 + with: + name: integration-reports + path: /tmp/reports/* integration-cli-prepare: runs-on: ubuntu-20.04 @@ -261,8 +313,26 @@ jobs: env: TEST_SKIP_INTEGRATION: 1 TESTFLAGS: "-test.run (${{ matrix.test }})/" + - + name: Prepare reports + if: always() + run: | + reportsPath=/tmp/reports/$(echo -n "${{ matrix.test }}" | sha256sum | cut -d " " -f 1) + mkdir -p bundles $reportsPath + echo "${{ matrix.test }}" | tr -s '|' '\n' | tee -a "$reportsPath/tests.txt" + find bundles -path '*/root/*overlay2' -prune -o -type f \( -name '*-report.json' -o -name '*.log' -o -name '*.out' -o -name '*.prof' -o -name '*-report.xml' \) -print | xargs sudo tar -czf /tmp/reports.tar.gz + tar -xzf /tmp/reports.tar.gz -C $reportsPath + sudo chown -R $(id -u):$(id -g) $reportsPath + tree -nh $reportsPath - name: Test daemon logs if: always() run: | cat bundles/test-integration/docker.log + - + name: Upload reports + if: always() + uses: actions/upload-artifact@v3 + with: + name: integration-cli-reports + path: /tmp/reports/* From cc7b8cc98030eb1f4c4175895148f46e496caebc Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 26 Aug 2022 20:19:00 +0200 Subject: [PATCH 6/7] ci(test): send coverage to codecov Signed-off-by: CrazyMax (cherry picked from commit 807c849431d1ccb15e5d010c19ee5dfaa8b11eb7) --- .github/workflows/test.yml | 23 +++++++++++++++++++++++ Jenkinsfile | 2 +- Makefile | 1 + hack/make/.integration-test-helpers | 17 ++++++++++++++--- hack/test/unit | 4 ++-- 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b72f4adba7..e5d9af9aab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -89,6 +89,13 @@ jobs: tar -xzf /tmp/reports.tar.gz -C /tmp/reports sudo chown -R $(id -u):$(id -g) /tmp/reports tree -nh /tmp/reports + - + name: Send to Codecov + uses: codecov/codecov-action@v3 + with: + directory: ./bundles + env_vars: RUNNER_OS + flags: unit - name: Upload reports if: always() @@ -222,6 +229,7 @@ jobs: make -o build test-integration env: TEST_SKIP_INTEGRATION_CLI: 1 + TESTCOVERAGE: 1 - name: Prepare reports if: always() @@ -235,6 +243,13 @@ jobs: tar -xzf /tmp/reports.tar.gz -C $reportsPath sudo chown -R $(id -u):$(id -g) $reportsPath tree -nh $reportsPath + - + name: Send to Codecov + uses: codecov/codecov-action@v3 + with: + directory: ./bundles/test-integration + env_vars: RUNNER_OS + flags: integration,${{ matrix.mode }} - name: Test daemon logs if: always() @@ -312,6 +327,7 @@ jobs: make -o build test-integration env: TEST_SKIP_INTEGRATION: 1 + TESTCOVERAGE: 1 TESTFLAGS: "-test.run (${{ matrix.test }})/" - name: Prepare reports @@ -324,6 +340,13 @@ jobs: tar -xzf /tmp/reports.tar.gz -C $reportsPath sudo chown -R $(id -u):$(id -g) $reportsPath tree -nh $reportsPath + - + name: Send to Codecov + uses: codecov/codecov-action@v3 + with: + directory: ./bundles/test-integration + env_vars: RUNNER_OS + flags: integration-cli - name: Test daemon logs if: always() diff --git a/Jenkinsfile b/Jenkinsfile index fd3408472e..4da30e1cfd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -234,7 +234,7 @@ pipeline { sh ''' bundleName=unit echo "Creating ${bundleName}-bundles.tar.gz" - tar -czvf ${bundleName}-bundles.tar.gz bundles/junit-report*.xml bundles/go-test-report*.json bundles/profile*.out + tar -czvf ${bundleName}-bundles.tar.gz bundles/junit-report*.xml bundles/go-test-report*.json bundles/coverage*.out ''' archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true diff --git a/Makefile b/Makefile index d5a9be0da0..93868c487d 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ DOCKER_ENVS := \ -e TEST_INTEGRATION_DIR \ -e TEST_SKIP_INTEGRATION \ -e TEST_SKIP_INTEGRATION_CLI \ + -e TESTCOVERAGE \ -e TESTDEBUG \ -e TESTDIRS \ -e TESTFLAGS \ diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers index 87614fea03..bbfc4edb86 100644 --- a/hack/make/.integration-test-helpers +++ b/hack/make/.integration-test-helpers @@ -16,6 +16,7 @@ source "${MAKEDIR}/.go-autogen" : "${TEST_REPEAT:=1}" : "${TESTFLAGS:=}" : "${TESTDEBUG:=}" +: "${TESTCOVERAGE:=}" : "${GOCACHE:=$(go env GOCACHE)}" setup_integration_test_filter() { @@ -80,7 +81,13 @@ run_test_integration_suites() { # Finally, we use periods as separator (instead of slashes) to be more # in line with Java package names (which is what junit.xml was designed for) pkgname="$(go env GOARCH).${pkgname//\//.}" - echo "Running $PWD (${pkgname}) flags=${flags}" + + pkgtestflags=$flags + if [ -n "${TESTCOVERAGE}" ]; then + pkgtestflags="$pkgtestflags -test.coverprofile=${ABS_DEST}/${pkgname//./-}-coverage.out" + fi + + echo "Running $PWD (${pkgname}) flags=${pkgtestflags}" [ -n "$TESTDEBUG" ] && set -x # shellcheck disable=SC2086 test_env gotestsum \ @@ -88,7 +95,7 @@ run_test_integration_suites() { --jsonfile="${ABS_DEST}/${pkgname//./-}-go-test-report.json" \ --junitfile="${ABS_DEST}/${pkgname//./-}-junit-report.xml" \ --raw-command \ - -- go tool test2json -p "${pkgname}" -t ./test.main ${flags} + -- go tool test2json -p "${pkgname}" -t ./test.main ${pkgtestflags} ); then exit 1; fi done } @@ -112,8 +119,12 @@ build_test_suite_binaries() { build_test_suite_binary() { local dir="$1" local out="$2" + local testflags echo Building test suite binary "$dir/$out" - go test -c -o "$dir/$out" -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" "$dir" + if [ -n "${TESTCOVERAGE}" ]; then + testflags="-cover -covermode=atomic" + fi + go test ${testflags} -c -o "$dir/$out" -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" "$dir" } cleanup_test_suite_binaries() { diff --git a/hack/test/unit b/hack/test/unit index 454e99291f..005d2e7cdd 100755 --- a/hack/test/unit +++ b/hack/test/unit @@ -32,7 +32,7 @@ if [ -n "${base_pkg_list}" ]; then gotestsum --format=standard-quiet --jsonfile=bundles/go-test-report.json --junitfile=bundles/junit-report.xml -- \ "${BUILDFLAGS[@]}" \ -cover \ - -coverprofile=bundles/profile.out \ + -coverprofile=bundles/coverage.out \ -covermode=atomic \ ${TESTFLAGS} \ ${base_pkg_list} @@ -44,7 +44,7 @@ if [ -n "${libnetwork_pkg_list}" ]; then gotestsum --format=standard-quiet --jsonfile=bundles/go-test-report-libnetwork.json --junitfile=bundles/junit-report-libnetwork.xml -- \ "${BUILDFLAGS[@]}" \ -cover \ - -coverprofile=bundles/profile-libnetwork.out \ + -coverprofile=bundles/coverage-libnetwork.out \ -covermode=atomic \ -p=1 \ ${TESTFLAGS} \ From d96d56ff09521e5095c94664244340e67edb99b0 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 30 Aug 2022 13:33:23 +0200 Subject: [PATCH 7/7] ci: fix .windows workflow name Signed-off-by: CrazyMax (cherry picked from commit 36688496cac7927659013707f10f9c57fe9f9b3a) --- .github/workflows/.windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/.windows.yml b/.github/workflows/.windows.yml index c93531355b..c49330a023 100644 --- a/.github/workflows/.windows.yml +++ b/.github/workflows/.windows.yml @@ -1,5 +1,5 @@ # reusable workflow -name: windows +name: .windows on: workflow_call: