Skip to content

Commit

Permalink
test gitlab flag vs circleci and our runner minus client
Browse files Browse the repository at this point in the history
  • Loading branch information
josiahzimmerman-caci committed Feb 4, 2025
1 parent 6840ed0 commit f85d2a6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ variables:
#CIRCLE_TOKEN: "$GITLAB_API_TOKEN" # GitLab API token for querying pipelines
CIRCLE_BUILD_NUM: "$CI_PIPELINE_ID"

GOPATH: "$CI_PROJECT_DIR/go"
# GOPATH: "$CI_PROJECT_DIR/go"
GOPATH: "/home/transcom/go"
GOLANGCI_LINT_CONCURRENCY: "4"
GOLANGCI_LINT_VERBOSE: "-v"

Expand Down Expand Up @@ -66,7 +67,7 @@ stages:
#set safe directory and path
.setup_milmove_env: &setup_milmove_env
- git config --global --add safe.directory /builds/milmove/mymove
- export PATH=${PATH}:${GOPATH}/bin:~/transcom/mymove/builds/milmove/mymove:/builds/milmove/mymove/scripts:/builds/milmove/mymove/bin
- export PATH=${PATH}:${GOPATH}/bin:/builds/milmove/mymove/scripts:/builds/milmove/mymove/bin
- export REACT_APP_ERROR_LOGGING=otel

.announce_failure: &announce_failure
Expand Down Expand Up @@ -804,9 +805,8 @@ server_test:
- make bin/swagger
- echo "server test"
- make -j 2 bin/milmove bin/gotestsum
- go mod tidy
- make server_test for app
# - go install gotest.tools/gotestsum@latest
# - go mod tidy
#- bin/gotestsum --junitfile server_test_report.xml --format server_test
allow_failure: true
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion scripts/run-server-test
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function server_report_cleanup()
percent=$(grep '(statements)' "${test_dir}/go-coverage.txt" | awk '{print substr($NF, 1, length($NF)-1)}')
goal_percent=50
# using a oneline python function to test if percent is less than goal and return a proper exit code
if python -c "exit(1) if ${percent} < ${goal_percent} else exit()"; then
if python3 -c "exit(1) if ${percent} < ${goal_percent} else exit()"; then
# coverage is good
echo "total coverage is ${percent}%"
else
Expand Down

0 comments on commit f85d2a6

Please sign in to comment.