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

GONRG-3345: fixed conflicts

parents dc4db612 7aa1f96d
Pipeline #66306 passed with stage
in 7 seconds
......@@ -43,6 +43,7 @@ include:
OSDU_GCP_SERVICE_HOST_SEARCH: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/search
OSDU_GCP_POLICY_API: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/policy/v1/
OSDU_GCP_UNIT_HOSTNAME: community.osdu-gcp.go3-nrg.projects.epam.com
OSDU_GCP_WELL_DELIVERY: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/well-delivery/
# common helm variables
OSDU_GCP_HELM_DEPLOYMENT_DIR: "devops/gcp/deploy"
OSDU_GCP_HELM_CONFIG_DIR: "devops/gcp/configmap"
......@@ -119,6 +120,9 @@ include:
DATA_DIR: /tmp/CloudTestData
DATA_PATTERN: Test*.0*.json
REPORT_PATH: /tmp/CloudTestData/Report/SuiteReport.txt
# well delivery
# NO ENDING SLASH !!!!!
OSDU_WELL_DELIVERY_SCHEMA_SERVICE_ENDPOINT: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/schema-service/v1
.common: &common
- gcloud auth activate-service-account --key-file $OSDU_GCP_DEPLOY_FILE
......@@ -208,6 +212,9 @@ osdu-gcp-test:
PUBSUB_TOKEN: $GCP_PUBSUB_TOKEN
STORAGE_URL: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/storage/v2/
HOST: https://os-schema-attcrcktoa-uc.a.run.app
# well delivery
SCHEMA_URL: https://community.osdu-gcp.go3-nrg.projects.epam.com/api/schema-service/v1/
ENTITY_URL: $OSDU_GCP_WELL_DELIVERY
script:
- export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE)
- >
......
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