Commit 7fbc8d6d authored by Aliaksandr Lubouski (EPAM)'s avatar Aliaksandr Lubouski (EPAM) 🥑
Browse files

Merge branch 'gcp-ent' into 'master'

(GONRG-2647) Gcp ent

See merge request !298
parents 7d797d58 b5b02652
Pipeline #53413 passed with stages
in 19 seconds
...@@ -65,6 +65,9 @@ include: ...@@ -65,6 +65,9 @@ include:
SKIP_HTTP_TESTS: "true" SKIP_HTTP_TESTS: "true"
HOST_URL: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/legal/v1/ HOST_URL: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/legal/v1/
ENABLE_FULL_BUCKET_NAME: "true" 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 .common: &common
- gcloud auth activate-service-account --key-file $OSDU_GCP_DEPLOY_FILE - gcloud auth activate-service-account --key-file $OSDU_GCP_DEPLOY_FILE
...@@ -145,6 +148,7 @@ osdu-gcp-test: ...@@ -145,6 +148,7 @@ osdu-gcp-test:
DE_ADMIN_TESTER: $OSDU_GCP_R3_ADMIN_TESTER DE_ADMIN_TESTER: $OSDU_GCP_R3_ADMIN_TESTER
DE_EDITOR_TESTER: $OSDU_GCP_R3_EDITOR_TESTER DE_EDITOR_TESTER: $OSDU_GCP_R3_EDITOR_TESTER
DE_NO_ACCESS_TESTER: $OSDU_GCP_R3_NO_ACCESS_TESTER DE_NO_ACCESS_TESTER: $OSDU_GCP_R3_NO_ACCESS_TESTER
ENTITLEMENT_V2_URL: $OSDU_GCP_ENTITLEMENTS_URL
script: script:
- export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE) - export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE)
- > - >
...@@ -153,7 +157,7 @@ osdu-gcp-test: ...@@ -153,7 +157,7 @@ osdu-gcp-test:
--settings=$CI_PROJECT_DIR/.mvn/community-maven.settings.xml --settings=$CI_PROJECT_DIR/.mvn/community-maven.settings.xml
-f $OSDU_GCP_TESTING_DIR/pom.xml -f $OSDU_GCP_TESTING_DIR/pom.xml
verify 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 2>&1 | tee test-results.log
only: only:
variables: variables:
......
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