Commit ae947e9f authored by Mikhail Piatliou (EPAM)'s avatar Mikhail Piatliou (EPAM)
Browse files

Merge branch 'master' into gcp-migrate-legal-to-gke

parents 32eb8780 7fbc8d6d
Pipeline #53538 passed with stage
in 12 seconds
......@@ -65,6 +65,9 @@ include:
SKIP_HTTP_TESTS: "true"
HOST_URL: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/legal/v1/
ENABLE_FULL_BUCKET_NAME: "true"
# entitlements integration tests
TENANT_NAME: osdu
OSDU_GCP_ENTITLEMENTS_URL: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/entitlements/v2/
.common: &common
- gcloud auth activate-service-account --key-file $OSDU_GCP_DEPLOY_FILE
......@@ -145,6 +148,7 @@ osdu-gcp-test:
DE_ADMIN_TESTER: $OSDU_GCP_R3_ADMIN_TESTER
DE_EDITOR_TESTER: $OSDU_GCP_R3_EDITOR_TESTER
DE_NO_ACCESS_TESTER: $OSDU_GCP_R3_NO_ACCESS_TESTER
ENTITLEMENT_V2_URL: $OSDU_GCP_ENTITLEMENTS_URL
script:
- export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE)
- >
......@@ -153,7 +157,7 @@ osdu-gcp-test:
--settings=$CI_PROJECT_DIR/.mvn/community-maven.settings.xml
-f $OSDU_GCP_TESTING_DIR/pom.xml
verify
--projects $OSDU_GCP_SERVICE-test-core,$OSDU_GCP_SERVICE-test-gcp
--projects $OSDU_GCP_SERVICE-test-core,$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR
2>&1 | tee test-results.log
only:
variables:
......
......@@ -20,7 +20,7 @@ fossa-analyze:
# then things will fail and we'll have to make this smarter
- test -z "$CI_COMMIT_BRANCH" && export CI_COMMIT_BRANCH="$CI_COMMIT_TAG"
- $MAVEN_FOREACH maven-fossa-output.txt install -DskipTests=true
- $MAVEN_FOREACH maven-fossa-output.txt install --update-snapshots -DskipTests=true
- cp "$CI_PROJECT_DIR/.mvn/community-maven.settings.xml" ~/.m2/settings.xml
- fossa analyze --project "${CI_PROJECT_TITLE}" --project-url "${CI_PROJECT_URL}" --branch "${CI_COMMIT_BRANCH}"
- fossa-check-for-licensing-issues
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment