From 54f929880e4391fa6394a109224b2af7e34fcadd Mon Sep 17 00:00:00 2001 From: CohenOrian <84377405+CohenOrian@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:49:44 +0300 Subject: [PATCH] Ws configuration (#760) * Updated WS configuration file * Added run-test command to makefile * deleted old credentials --- .pipeline/config.yml | 2 -- Makefile | 20 ++++++++++++++++++++ wss-unified-agent-go.config | 6 +++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.pipeline/config.yml b/.pipeline/config.yml index e7caa7bf9..cec9c0717 100644 --- a/.pipeline/config.yml +++ b/.pipeline/config.yml @@ -2,8 +2,6 @@ general: githubApiUrl: 'https://api.github.com' githubServerUrl: 'https://github.com' - gitSshKeyCredentialsId: 'alex-github-ssh' - githubTokenCredentialsId: 'alex-public-github-token' steps: pollBuilds: diff --git a/Makefile b/Makefile index f3f93e468..497b90548 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ GO ?= go GOFMT ?= gofmt BINDIR ?= bin PROJECT_PKG ?= github.com/Peripli/service-manager +TEST_PROFILE_OUT= cover.out PLATFORM ?= linux ARCH ?= amd64 @@ -178,6 +179,25 @@ coverage: test-report ## Produces an HTML report containing code coverage detail @go tool cover -html=$(TEST_PROFILE) -o $(COVERAGE) @echo Generated coverage report in $(COVERAGE). +go-deps: + set GO111MODULE=off + go get gotest.tools/gotestsum + go get github.com/t-yuki/gocover-cobertura + go install github.com/axw/gocov/gocov@latest + go get github.com/AlekSi/gocov-xml + go get -u github.com/jstemmer/go-junit-report + set GO111MODULE=on + go mod tidy +# Run tests + +run-test: go-deps + rm -rf reports + mkdir -p reports + $(GOBIN)/gotestsum --junitfile reports/junit.xml -- -coverprofile=cover.out ./... -mod=mod + go tool cover -func $(TEST_PROFILE_OUT) | grep total + find . -name cover.out -execdir sh -c '$(GOBIN)/gocover-cobertura < cover.out > coverage.xml' \; ;\ + GO111MODULE=on + clean-generate: @rm -f generate diff --git a/wss-unified-agent-go.config b/wss-unified-agent-go.config index 2e5e5bc17..82484c1d2 100644 --- a/wss-unified-agent-go.config +++ b/wss-unified-agent-go.config @@ -19,8 +19,8 @@ go.dependencyManager=modules ################################## # Organization tokens: ################################## -apiKey= -userKey= +#apiKey= +#userKey= projectName= projectVersion= @@ -35,6 +35,6 @@ productToken= includes=**/*.lock excludes= + case.sensitive.glob=false followSymbolicLinks=true -