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

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

Osdu gcp vars

See merge request !78
parents afae2f6b d7421e42
Pipeline #9742 passed with stages
in 15 seconds
...@@ -110,6 +110,7 @@ osdu-gcp-test: ...@@ -110,6 +110,7 @@ osdu-gcp-test:
DELIVERY_HOST: $OSDU_GCP_DELIVERY_SERVICE_URL DELIVERY_HOST: $OSDU_GCP_DELIVERY_SERVICE_URL
SEARCH_HOST: $OSDU_GCP_SEARCH_HOST SEARCH_HOST: $OSDU_GCP_SEARCH_HOST
STORAGE_HOST: $OSDU_GCP_STORAGE_URL STORAGE_HOST: $OSDU_GCP_STORAGE_URL
SEARCH_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
script: script:
- echo $TEST_FILE_ID - echo $TEST_FILE_ID
- echo $INGEST_HOST - echo $INGEST_HOST
...@@ -117,7 +118,7 @@ osdu-gcp-test: ...@@ -117,7 +118,7 @@ osdu-gcp-test:
- export INTEGRATION_TESTER=$(echo $OSDU_GCP_R3_INTEGRATION_TESTER) - export INTEGRATION_TESTER=$(echo $OSDU_GCP_R3_INTEGRATION_TESTER)
- export NO_DATA_ACCESS_TESTER=$(echo $OSDU_GCP_R3_NO_DATA_ACCESS_TESTER) - export NO_DATA_ACCESS_TESTER=$(echo $OSDU_GCP_R3_NO_DATA_ACCESS_TESTER)
- export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE) - export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE)
- export SEARCH_INTEGRATION_TESTER=$(echo $OSDU_GCP_INTEGRATION_TESTER) - echo $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 - 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: only:
variables: variables:
......
...@@ -82,9 +82,7 @@ osdu-gcp-test: ...@@ -82,9 +82,7 @@ osdu-gcp-test:
SEARCH_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER SEARCH_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
SEARCH_HOST: $OSDU_GCP_SEARCH_HOST SEARCH_HOST: $OSDU_GCP_SEARCH_HOST
# integration test vars for storage service # integration test vars for storage service
INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
PUBSUB_TOKEN: $OSDU_GCP_PUBSUB_TOKEN PUBSUB_TOKEN: $OSDU_GCP_PUBSUB_TOKEN
NO_DATA_ACCESS_TESTER: $OSDU_GCP_NO_DATA_ACCESS_TESTER
STORAGE_URL: $OSDU_GCP_STORAGE_URL STORAGE_URL: $OSDU_GCP_STORAGE_URL
AUTHORIZE_API: $OSDU_GCP_ENTITLEMENTS_URL AUTHORIZE_API: $OSDU_GCP_ENTITLEMENTS_URL
HOST_URL: $OSDU_GCP_LEGAL_HOST_URL HOST_URL: $OSDU_GCP_LEGAL_HOST_URL
...@@ -92,6 +90,9 @@ osdu-gcp-test: ...@@ -92,6 +90,9 @@ osdu-gcp-test:
ENTITLEMENT_URL: $OSDU_GCP_ENTITLEMENT_URL ENTITLEMENT_URL: $OSDU_GCP_ENTITLEMENT_URL
script: script:
- cd $OSDU_GCP_INT_TEST_SUBDIR - cd $OSDU_GCP_INT_TEST_SUBDIR
- 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)
# start tests # start tests
- $MAVEN test - $MAVEN test
only: 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