From 9a2e87c1d7373cdeba3169ddf1729708febea968 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Fri, 4 Apr 2025 13:15:10 +0200 Subject: [PATCH 01/20] generate coverage report in ci --- .github/workflows/lint-test-build-publish.yml | 7 +++++++ README.md | 3 +++ mage/test.go | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.github/workflows/lint-test-build-publish.yml b/.github/workflows/lint-test-build-publish.yml index 46671ee5..8f704564 100644 --- a/.github/workflows/lint-test-build-publish.yml +++ b/.github/workflows/lint-test-build-publish.yml @@ -194,6 +194,13 @@ jobs: - name: Run tests run: mage test:golang + - name: Upload coverage report + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + with: + name: Code coverage report + path: coverprofile.out + retention-days: 1 + build-containers: name: Build and publish containers runs-on: ubuntu-latest diff --git a/README.md b/README.md index d1098538..d18042b9 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ TODO: Update all links once the GitHub repository is created. +Test coverage + + ## Overview The orch-utils repository is a crucial component of the Edge Orchestrator, providing various utility functions and tools diff --git a/mage/test.go b/mage/test.go index a163b7e3..6c041234 100644 --- a/mage/test.go +++ b/mage/test.go @@ -55,6 +55,9 @@ func (Test) golang() error { "--race", "-randomize-all", "-randomize-suites", + "--cover", + //"--keep-separate-coverprofiles", + //"--coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), ) } From 378153e62c34d42f0b053d0e6f9fbfb754cd61fa Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Fri, 4 Apr 2025 13:36:21 +0200 Subject: [PATCH 02/20] fixed linter --- .github/workflows/lint-test-build-publish.yml | 3 +++ mage/test.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-test-build-publish.yml b/.github/workflows/lint-test-build-publish.yml index 8f704564..950296b6 100644 --- a/.github/workflows/lint-test-build-publish.yml +++ b/.github/workflows/lint-test-build-publish.yml @@ -194,6 +194,9 @@ jobs: - name: Run tests run: mage test:golang + - name: Convert coverage to human readable format + run: go tool cover -func=coverprofile.out -o=coverprofile.out + - name: Upload coverage report uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: diff --git a/mage/test.go b/mage/test.go index 6c041234..16cc2211 100644 --- a/mage/test.go +++ b/mage/test.go @@ -56,8 +56,8 @@ func (Test) golang() error { "-randomize-all", "-randomize-suites", "--cover", - //"--keep-separate-coverprofiles", - //"--coverpkg="+strings.Join(skippedPackages, ","), + // "--keep-separate-coverprofiles", + "--coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), ) } From a358cdff142c99a4827d090a9e93c20265151d2f Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Fri, 4 Apr 2025 13:49:03 +0200 Subject: [PATCH 03/20] comment out coverage --- mage/test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mage/test.go b/mage/test.go index 16cc2211..c4d884a0 100644 --- a/mage/test.go +++ b/mage/test.go @@ -55,9 +55,9 @@ func (Test) golang() error { "--race", "-randomize-all", "-randomize-suites", - "--cover", + // "--cover", // "--keep-separate-coverprofiles", - "--coverpkg="+strings.Join(skippedPackages, ","), + // "--coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), ) } From 8ec17739799e33db4c0cca7226c97ac0d6b3a83b Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 11:14:05 +0200 Subject: [PATCH 04/20] revert changes in readme --- README.md | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/README.md b/README.md index d18042b9..c34d3fd9 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,6 @@ [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Build](https://github.com/open-edge-platform/orch-utils/actions/workflows/lint-test-build-publish.yml/badge.svg)](https://github.com/open-edge-platform/orch-utils/actions/workflows/lint-test-build-publish.yml) -TODO: Update all links once the GitHub repository is created. - -Test coverage - - ## Overview The orch-utils repository is a crucial component of the Edge Orchestrator, providing various utility functions and tools @@ -99,15 +94,4 @@ For support, start with [Troubleshooting](https://github.com/intel) or [contact ## License -```text -Copyright 2025 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the -License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific -language governing permissions and limitations under the License. -``` +Edge Manageability Framework is licensed under [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) From 5a220028c4999d15193e4f6c8677d993148f55d3 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 12:03:54 +0200 Subject: [PATCH 05/20] archiving coverage --- .github/workflows/lint-test-build-publish.yml | 11 +++++++---- .gitmodules | 12 ++++++++++++ mage/test.go | 3 ++- .../tests/gitsubmodules/amc-app-orch-catalog-openapi | 1 + .../amc-app-orch-catalog-utilities-openapi | 1 + ...pp-orch-deployment-app-deployment-manager-openapi | 1 + ...-app-orch-deployment-app-resource-manager-openapi | 1 + 7 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 160000 tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi create mode 160000 tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi create mode 160000 tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi create mode 160000 tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi diff --git a/.github/workflows/lint-test-build-publish.yml b/.github/workflows/lint-test-build-publish.yml index e7f4d84a..139698f2 100644 --- a/.github/workflows/lint-test-build-publish.yml +++ b/.github/workflows/lint-test-build-publish.yml @@ -195,13 +195,16 @@ jobs: run: mage test:golang - name: Convert coverage to human readable format - run: go tool cover -func=coverprofile.out -o=coverprofile.out + run: | + mkdir coverage + find . -regex ".*coverprofile.*" -exec sh -c 'cp $1 coverage/$(echo $1 | sed "s/\//-/g" | cut -c 3-)' sh {} ';' + tar -cf coverage.tar coverage/ - - name: Upload coverage report + - name: Upload coverage reports uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: - name: Code coverage report - path: coverprofile.out + name: Code coverage reports + path: coverage.tar retention-days: 1 build-containers: diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..dd6c4903 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi"] + path = tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi + url = https://github.com/open-edge-platform/app-orch-catalog.git +[submodule "tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi"] + path = tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi + url = https://github.com/open-edge-platform/app-orch-catalog.git +[submodule "tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi"] + path = tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi + url = https://github.com/open-edge-platform/app-orch-deployment.git +[submodule "tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi"] + path = tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi + url = https://github.com/open-edge-platform/app-orch-deployment.git diff --git a/mage/test.go b/mage/test.go index c4d884a0..a7211f50 100644 --- a/mage/test.go +++ b/mage/test.go @@ -55,7 +55,8 @@ func (Test) golang() error { "--race", "-randomize-all", "-randomize-suites", - // "--cover", + "--cover", + "-coverpkg=./...", // "--keep-separate-coverprofiles", // "--coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), diff --git a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi new file mode 160000 index 00000000..8564dc1f --- /dev/null +++ b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi @@ -0,0 +1 @@ +Subproject commit 8564dc1f48fd15468c46da64aaee172080c3f5b4 diff --git a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi new file mode 160000 index 00000000..8564dc1f --- /dev/null +++ b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi @@ -0,0 +1 @@ +Subproject commit 8564dc1f48fd15468c46da64aaee172080c3f5b4 diff --git a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi new file mode 160000 index 00000000..3fb3b53a --- /dev/null +++ b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi @@ -0,0 +1 @@ +Subproject commit 3fb3b53ac21741d087ebf40e7641858a56275133 diff --git a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi new file mode 160000 index 00000000..3fb3b53a --- /dev/null +++ b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi @@ -0,0 +1 @@ +Subproject commit 3fb3b53ac21741d087ebf40e7641858a56275133 From ea9d5b495e8f934cdbfb696446980c26e08ea707 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 12:14:00 +0200 Subject: [PATCH 06/20] revert changes in api mapping --- .../cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi | 1 - .../tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi | 1 - .../amc-app-orch-deployment-app-deployment-manager-openapi | 1 - .../amc-app-orch-deployment-app-resource-manager-openapi | 1 - 4 files changed, 4 deletions(-) delete mode 160000 tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi delete mode 160000 tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi delete mode 160000 tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi delete mode 160000 tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi diff --git a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi deleted file mode 160000 index 8564dc1f..00000000 --- a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8564dc1f48fd15468c46da64aaee172080c3f5b4 diff --git a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi deleted file mode 160000 index 8564dc1f..00000000 --- a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8564dc1f48fd15468c46da64aaee172080c3f5b4 diff --git a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi deleted file mode 160000 index 3fb3b53a..00000000 --- a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3fb3b53ac21741d087ebf40e7641858a56275133 diff --git a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi b/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi deleted file mode 160000 index 3fb3b53a..00000000 --- a/tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3fb3b53ac21741d087ebf40e7641858a56275133 From 6dc7a17bdc0b33ee155b52cc651e8bf25d15239a Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 12:15:20 +0200 Subject: [PATCH 07/20] always save coverage --- .github/workflows/lint-test-build-publish.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-build-publish.yml b/.github/workflows/lint-test-build-publish.yml index 139698f2..4092b7c4 100644 --- a/.github/workflows/lint-test-build-publish.yml +++ b/.github/workflows/lint-test-build-publish.yml @@ -194,13 +194,15 @@ jobs: - name: Run tests run: mage test:golang - - name: Convert coverage to human readable format + - name: Copy all coverage reports to single directory + if: always() run: | mkdir coverage find . -regex ".*coverprofile.*" -exec sh -c 'cp $1 coverage/$(echo $1 | sed "s/\//-/g" | cut -c 3-)' sh {} ';' tar -cf coverage.tar coverage/ - name: Upload coverage reports + if: always() uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: name: Code coverage reports From 74817582d7d63ff123513c903926e67d09fb4d58 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 12:50:40 +0200 Subject: [PATCH 08/20] remove gitmodules file --- .gitmodules | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index dd6c4903..00000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi"] - path = tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-openapi - url = https://github.com/open-edge-platform/app-orch-catalog.git -[submodule "tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi"] - path = tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-catalog-utilities-openapi - url = https://github.com/open-edge-platform/app-orch-catalog.git -[submodule "tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi"] - path = tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-deployment-manager-openapi - url = https://github.com/open-edge-platform/app-orch-deployment.git -[submodule "tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi"] - path = tenancy-api-mapping/cmd/specgen/tests/gitsubmodules/amc-app-orch-deployment-app-resource-manager-openapi - url = https://github.com/open-edge-platform/app-orch-deployment.git From 445c70805fcd343ead83a44fa807301b7e0356fe Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 13:22:42 +0200 Subject: [PATCH 09/20] check without coverage --- .github/workflows/lint-test-build-publish.yml | 5 ++--- mage/test.go | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint-test-build-publish.yml b/.github/workflows/lint-test-build-publish.yml index 4092b7c4..63777984 100644 --- a/.github/workflows/lint-test-build-publish.yml +++ b/.github/workflows/lint-test-build-publish.yml @@ -197,16 +197,15 @@ jobs: - name: Copy all coverage reports to single directory if: always() run: | - mkdir coverage + mkdir -p coverage find . -regex ".*coverprofile.*" -exec sh -c 'cp $1 coverage/$(echo $1 | sed "s/\//-/g" | cut -c 3-)' sh {} ';' - tar -cf coverage.tar coverage/ - name: Upload coverage reports if: always() uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: name: Code coverage reports - path: coverage.tar + path: coverage retention-days: 1 build-containers: diff --git a/mage/test.go b/mage/test.go index a7211f50..cf8d8d84 100644 --- a/mage/test.go +++ b/mage/test.go @@ -55,8 +55,8 @@ func (Test) golang() error { "--race", "-randomize-all", "-randomize-suites", - "--cover", - "-coverpkg=./...", + // "--cover", + // "-coverpkg=./...", // "--keep-separate-coverprofiles", // "--coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), From 31408b4aa5b2447e4e84c0d98d2f21863debf0a3 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 13:28:51 +0200 Subject: [PATCH 10/20] added parameter for tests --- mage/test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/mage/test.go b/mage/test.go index cf8d8d84..13d51d4d 100644 --- a/mage/test.go +++ b/mage/test.go @@ -55,6 +55,7 @@ func (Test) golang() error { "--race", "-randomize-all", "-randomize-suites", + "--keep-going", // "--cover", // "-coverpkg=./...", // "--keep-separate-coverprofiles", From ab383ff0aaf90689f591c1a8d3424c42f300df61 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 14:01:28 +0200 Subject: [PATCH 11/20] enable coverage reports --- mage/test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mage/test.go b/mage/test.go index 13d51d4d..e959296e 100644 --- a/mage/test.go +++ b/mage/test.go @@ -56,10 +56,8 @@ func (Test) golang() error { "-randomize-all", "-randomize-suites", "--keep-going", - // "--cover", - // "-coverpkg=./...", - // "--keep-separate-coverprofiles", - // "--coverpkg="+strings.Join(skippedPackages, ","), + "--cover", + "-coverpkg=./...", "--skip-package="+strings.Join(skippedPackages, ","), ) } From 1082d40b56f0ca7991ce07e80bf3f27ed9cd7127 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 14:09:49 +0200 Subject: [PATCH 12/20] compute coverage to skipped modules --- mage/test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mage/test.go b/mage/test.go index e959296e..5d5bc2f7 100644 --- a/mage/test.go +++ b/mage/test.go @@ -57,7 +57,7 @@ func (Test) golang() error { "-randomize-suites", "--keep-going", "--cover", - "-coverpkg=./...", + "-coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), ) } From c4589e38a4c0a57fc5212162eb8f29f8f55187eb Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 14:18:18 +0200 Subject: [PATCH 13/20] added more params for tests --- mage/test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mage/test.go b/mage/test.go index 5d5bc2f7..8a42bf3d 100644 --- a/mage/test.go +++ b/mage/test.go @@ -55,6 +55,8 @@ func (Test) golang() error { "--race", "-randomize-all", "-randomize-suites", + "--fail-on-pending", + "--fail-on-empty", "--keep-going", "--cover", "-coverpkg="+strings.Join(skippedPackages, ","), From f94ed7e9493f8d57b4d831de9757b715e62f33e9 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 14:53:10 +0200 Subject: [PATCH 14/20] adjusted timeout to new functions --- .github/workflows/lint-test-build-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-build-publish.yml b/.github/workflows/lint-test-build-publish.yml index 63777984..69e4cdee 100644 --- a/.github/workflows/lint-test-build-publish.yml +++ b/.github/workflows/lint-test-build-publish.yml @@ -160,7 +160,7 @@ jobs: test-go: name: Test Go runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 25 needs: - lint-go - check-license From 10b2707212e6cf0d35c2468b1fd73d13b6d36667 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 15:13:56 +0200 Subject: [PATCH 15/20] Added github actions output --- mage/Magefile.go | 7 ++++++- mage/test.go | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mage/Magefile.go b/mage/Magefile.go index c0b345f9..48b6fcc5 100644 --- a/mage/Magefile.go +++ b/mage/Magefile.go @@ -256,7 +256,12 @@ type Test mg.Namespace // Test Go source files. func (t Test) Golang() error { - return t.golang() + return t.golang("") +} + +// Test Go source files. (only use it inside CI) +func (t Test) GolangCI() error { + return t.golang("--github-output") } // Namespace contains clean targets. diff --git a/mage/test.go b/mage/test.go index 8a42bf3d..69b3ea7a 100644 --- a/mage/test.go +++ b/mage/test.go @@ -11,7 +11,7 @@ import ( "github.com/magefile/mage/sh" ) -func (Test) golang() error { +func (Test) golang(additionalParams string) error { _ = sh.RunV( "ginkgo", "version", @@ -61,5 +61,6 @@ func (Test) golang() error { "--cover", "-coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), + additionalParams, ) } From 65040290a8a72480aac6a96f37b8eac6aa6e71cf Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 15:14:31 +0200 Subject: [PATCH 16/20] use new mage target for better output --- .github/workflows/lint-test-build-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-build-publish.yml b/.github/workflows/lint-test-build-publish.yml index 69e4cdee..3f601948 100644 --- a/.github/workflows/lint-test-build-publish.yml +++ b/.github/workflows/lint-test-build-publish.yml @@ -192,7 +192,7 @@ jobs: run: find . -name "go.mod" -execdir go mod download -x \; - name: Run tests - run: mage test:golang + run: mage test:golangCI - name: Copy all coverage reports to single directory if: always() From 1ccb71806ca4e920d77d6862ee1ceb8b076d13c4 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Wed, 9 Apr 2025 15:23:37 +0200 Subject: [PATCH 17/20] fixed description for target --- mage/Magefile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mage/Magefile.go b/mage/Magefile.go index 48b6fcc5..1bd2dde6 100644 --- a/mage/Magefile.go +++ b/mage/Magefile.go @@ -259,7 +259,7 @@ func (t Test) Golang() error { return t.golang("") } -// Test Go source files. (only use it inside CI) +// Test Go source files (only use it inside CI). func (t Test) GolangCI() error { return t.golang("--github-output") } From 1f0161cd3f6d8ed4326ac7fc4b9bec401d165722 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Thu, 10 Apr 2025 01:16:14 -0700 Subject: [PATCH 18/20] remove additional params --- .github/workflows/lint-test-build-publish.yml | 2 +- mage/Magefile.go | 7 +------ mage/test.go | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint-test-build-publish.yml b/.github/workflows/lint-test-build-publish.yml index 3f601948..69e4cdee 100644 --- a/.github/workflows/lint-test-build-publish.yml +++ b/.github/workflows/lint-test-build-publish.yml @@ -192,7 +192,7 @@ jobs: run: find . -name "go.mod" -execdir go mod download -x \; - name: Run tests - run: mage test:golangCI + run: mage test:golang - name: Copy all coverage reports to single directory if: always() diff --git a/mage/Magefile.go b/mage/Magefile.go index 1bd2dde6..c0b345f9 100644 --- a/mage/Magefile.go +++ b/mage/Magefile.go @@ -256,12 +256,7 @@ type Test mg.Namespace // Test Go source files. func (t Test) Golang() error { - return t.golang("") -} - -// Test Go source files (only use it inside CI). -func (t Test) GolangCI() error { - return t.golang("--github-output") + return t.golang() } // Namespace contains clean targets. diff --git a/mage/test.go b/mage/test.go index 69b3ea7a..8a42bf3d 100644 --- a/mage/test.go +++ b/mage/test.go @@ -11,7 +11,7 @@ import ( "github.com/magefile/mage/sh" ) -func (Test) golang(additionalParams string) error { +func (Test) golang() error { _ = sh.RunV( "ginkgo", "version", @@ -61,6 +61,5 @@ func (Test) golang(additionalParams string) error { "--cover", "-coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), - additionalParams, ) } From c4e144a6265a571827744e3239f6ca8215dbe4d3 Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Thu, 10 Apr 2025 11:16:50 +0200 Subject: [PATCH 19/20] disable coverage --- mage/test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mage/test.go b/mage/test.go index 69b3ea7a..3f19436c 100644 --- a/mage/test.go +++ b/mage/test.go @@ -55,11 +55,11 @@ func (Test) golang(additionalParams string) error { "--race", "-randomize-all", "-randomize-suites", - "--fail-on-pending", - "--fail-on-empty", - "--keep-going", - "--cover", - "-coverpkg="+strings.Join(skippedPackages, ","), + // "--fail-on-pending", + // "--fail-on-empty", + // "--keep-going", + // "--cover", + // "-coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), additionalParams, ) From 55985dfbd62b4e07492f634c860d05a115a1777c Mon Sep 17 00:00:00 2001 From: "Iracki, Patryk" Date: Thu, 10 Apr 2025 12:08:02 +0200 Subject: [PATCH 20/20] re-enable coverage --- mage/test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mage/test.go b/mage/test.go index 29ac7b14..382f2d76 100644 --- a/mage/test.go +++ b/mage/test.go @@ -58,7 +58,7 @@ func (Test) golang() error { // "--fail-on-pending", // "--fail-on-empty", // "--keep-going", - // "--cover", + "--cover", // "-coverpkg="+strings.Join(skippedPackages, ","), "--skip-package="+strings.Join(skippedPackages, ","), )