Commit ae9a5b9e authored by Oleksandr Kosse (EPAM)'s avatar Oleksandr Kosse (EPAM)
Browse files

Merge branch 'osdu-gcp-vars' into 'master'

Osdu gcp vars: add and move

See merge request !74
parents c29dcfed 643fb2dc
Pipeline #9630 passed with stages
in 15 seconds
......@@ -102,18 +102,22 @@ osdu-gcp-test:
stage: integration
needs: ["osdu-gcp-deploy"]
allow_failure: true
variables:
WORKFLOW_HOST: $OSDU_GCP_WORKFLOW_SERVICE_URL
INGEST_HOST: $OSDU_GCP_INGEST_HOST
TEST_FILE_ID: $OSDU_GCP_TEST_FILE_ID
FILE_SERVICE_HOST: $OSDU_GCP_FILE_URL
DELIVERY_HOST: $OSDU_GCP_DELIVERY_SERVICE_URL
SEARCH_HOST: $OSDU_GCP_SEARCH_HOST
STORAGE_HOST: $OSDU_GCP_STORAGE_URL
SEARCH_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
script:
- echo $TEST_FILE_ID
- echo $INGEST_HOST
- echo $DELIVERY_HOST
- export INTEGRATION_TESTER=$(echo $OSDU_GCP_R3_INTEGRATION_TESTER)
- export NO_DATA_ACCESS_TESTER=$(echo $OSDU_GCP_R3_NO_DATA_ACCESS_TESTER)
- export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE)
- export WORKFLOW_HOST=$OSDU_GCP_WORKFLOW_SERVICE_URL
- export INGEST_HOST=$OSDU_GCP_INGEST_HOST
- export TEST_FILE_ID=$OSDU_GCP_TEST_FILE_ID
- export FILE_SERVICE_HOST=$OSDU_GCP_FILE_URL
- export DELIVERY_HOST=$OSDU_GCP_DELIVERY_SERVICE_URL
- export SEARCH_HOST=$OSDU_GCP_SEARCH_HOST
- export STORAGE_HOST=$OSDU_GCP_STORAGE_URL
- export SEARCH_INTEGRATION_TESTER=$OSDU_GCP_INTEGRATION_TESTER
- mvn --batch-mode --settings=$CI_PROJECT_DIR/.mvn/community-maven.settings.xml -f testing/pom.xml verify --projects $OSDU_GCP_SERVICE-test-core,$OSDU_GCP_SERVICE-test-gcp
only:
variables:
......
......@@ -29,6 +29,7 @@
GCLOUD_PROJECT: nice-etching-277309
LEGAL_TAG: osdu-demo-legaltag
OTHER_RELEVANT_DATA_COUNTRIES: US
STORAGE_HOST: os-storage-dot-nice-etching-277309.uc.r.appspot.com
......@@ -69,27 +70,28 @@ osdu-gcp-test:
- .OSDU_GCP_variables
stage: integration
needs: ["osdu-gcp-deploy"]
script:
- cd $OSDU_GCP_INT_TEST_SUBDIR
variables:
# integration test variables for search service
- export ENTITLEMENTS_HOST=$OSDU_GCP_ENTITLEMENTS_URL
- export ELASTIC_PASSWORD=$OSDU_GCP_ELASTIC_PASSWORD
- export ELASTIC_USER_NAME=$OSDU_GCP_ELASTIC_USER
- export ELASTIC_HOST=$OSDU_GCP_ELASTIC_HOST
- export ELASTIC_PORT=$OSDU_GCP_ELASTIC_PORT
- export SEARCH_ON_BEHALF_INTEGRATION_TESTER=$OSDU_GCP_INTEGRATION_TESTER
- export INDEXER_HOST=$OSDU_GCP_INDEXER_HOST
- export SEARCH_INTEGRATION_TESTER=$OSDU_GCP_INTEGRATION_TESTER
- export SEARCH_HOST=$OSDU_GCP_SEARCH_HOST
- ENTITLEMENTS_HOST: $OSDU_GCP_ENTITLEMENTS_URL
- ELASTIC_PASSWORD: $OSDU_GCP_ELASTIC_PASSWORD
- ELASTIC_USER_NAME: $OSDU_GCP_ELASTIC_USER
- ELASTIC_HOST: $OSDU_GCP_ELASTIC_HOST
- ELASTIC_PORT: $OSDU_GCP_ELASTIC_PORT
- SEARCH_ON_BEHALF_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
- INDEXER_HOST: $OSDU_GCP_INDEXER_HOST
- SEARCH_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
- SEARCH_HOST: $OSDU_GCP_SEARCH_HOST
# integration test vars for storage service
- export INTEGRATION_TESTER=$OSDU_GCP_INTEGRATION_TESTER
- export PUBSUB_TOKEN=$OSDU_GCP_PUBSUB_TOKEN
- export NO_DATA_ACCESS_TESTER=$OSDU_GCP_NO_DATA_ACCESS_TESTER
- export STORAGE_URL=$OSDU_GCP_STORAGE_URL
- export AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_URL
- export HOST_URL=$OSDU_GCP_LEGAL_HOST_URL
- export LEGAL_URL=$OSDU_GCP_LEGAL_HOST_URL
- export ENTITLEMENT_URL=$OSDU_GCP_ENTITLEMENT_URL
- INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
- PUBSUB_TOKEN: $OSDU_GCP_PUBSUB_TOKEN
- NO_DATA_ACCESS_TESTER: $OSDU_GCP_NO_DATA_ACCESS_TESTER
- STORAGE_URL: $OSDU_GCP_STORAGE_URL
- AUTHORIZE_API: $OSDU_GCP_ENTITLEMENTS_URL
- HOST_URL: $OSDU_GCP_LEGAL_HOST_URL
- LEGAL_URL: $OSDU_GCP_LEGAL_HOST_URL
- ENTITLEMENT_URL: $OSDU_GCP_ENTITLEMENT_URL
script:
- cd $OSDU_GCP_INT_TEST_SUBDIR
# start tests
- $MAVEN test
only:
......
Supports Markdown
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