Commit 1a4bf954 authored by harshit aggarwal's avatar harshit aggarwal
Browse files

Merge branch 'master' into haaggarw/AddingAzureWithBoostrap.yml

parents bf36cefb 5de31569
Pipeline #10967 passed with stage
in 7 seconds
......@@ -69,6 +69,7 @@
ENTITLEMENTS_URL: $AWS_ENTITLEMENTS_URL
VIRTUAL_SERVICE_HOST_NAME: $AWS_API_GATEWAY_HOST
HOST: $AWS_API_GATEWAY_URL
PARTITION_BASE_URL: $AWS_API_GATEWAY_URL/ #needs trailing slash
.aws:
tags: ['osdu-medium']
......
......@@ -35,6 +35,7 @@
SEARCH_URL: https://${AZURE_DNS_NAME}/api/search/v2/
INDEXER_URL: https://${AZURE_DNS_NAME}/api/indexer/v2/
DELIVERY_URL: https://${AZURE_DNS_NAME}/api/delivery/v2/
FILE_URL: https://${AZURE_DNS_NAME}/api/file/v2/
AZURE_AD_TENANT_ID: $AZURE_TENANT_ID
INTEGRATION_TESTER: $AZURE_PRINCIPAL_ID
AZURE_TESTER_SERVICEPRINCIPAL_SECRET: $AZURE_PRINCIPAL_SECRET
......@@ -91,6 +92,11 @@
#Schema
PRIVATE_TENANT1: $MY_TENANT
PRIVATE_TENANT2: tenant2
#File
FILE_SERVICE_HOST: $FILE_URL
USER_ID: "osdu-user"
EXIST_FILE_ID: "8900a83f-18c6-4b1d-8f38-309a208779cc"
......
......@@ -108,6 +108,7 @@ ibm-deploy:
ibm-test:
stage: integration
needs: ["ibm-deploy"]
allow_failure: true
extends:
- .maven
- .ibm_variables
......@@ -134,6 +135,7 @@ ibm-test-py:
stage: integration
image: python:3.6
needs: ["ibm-deploy"]
allow_failure: true
extends:
- .ibm_variables
script:
......
......@@ -25,6 +25,8 @@
.osdu-gcp-variables:
variables:
#services' urls
# placeholder(stub) for register service
OSDU_GCP_REGISTER_URL: https://os-register-dot-opendes.appspot.com/api/register/v1/
OSDU_GCP_ENTITLEMENTS_URL: https://os-entitlements-gcp-attcrcktoa-uc.a.run.app/entitlements/v1/
OSDU_GCP_AUTHORIZE_API: https://os-entitlements-gcp-attcrcktoa-uc.a.run.app/entitlements/v1/
OSDU_GCP_STORAGE_URL: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2/
......
......@@ -35,8 +35,6 @@
OTHER_RELEVANT_DATA_COUNTRIES: US
STORAGE_HOST: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2/
.osdu-gcp:
tags: ["osdu-medium"]
image: google/cloud-sdk
......@@ -75,7 +73,7 @@ osdu-gcp-test:
stage: integration
needs: ["osdu-gcp-deploy"]
variables:
# integration test variables for search service
# integration test variables for search service
ENTITLEMENTS_HOST: $OSDU_GCP_ENTITLEMENTS_URL
ELASTIC_PASSWORD: $OSDU_GCP_ELASTIC_PASSWORD
ELASTIC_USER_NAME: $OSDU_GCP_ELASTIC_USER
......@@ -83,8 +81,11 @@ osdu-gcp-test:
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
# integration test variables for search service
PUBSUB_TOKEN: $OSDU_GCP_PUBSUB_TOKEN
STORAGE_URL: $OSDU_GCP_STORAGE_URL
AUTHORIZE_API: $OSDU_GCP_ENTITLEMENTS_URL
......@@ -93,12 +94,13 @@ osdu-gcp-test:
ENTITLEMENT_URL: $OSDU_GCP_ENTITLEMENT_URL
INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
NO_DATA_ACCESS_TESTER: $OSDU_GCP_NO_DATA_ACCESS_TESTER
SEARCH_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
script:
- cd $OSDU_GCP_INT_TEST_SUBDIR
- export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE)
- cd $OSDU_GCP_INT_TEST_SUBDIR
# start tests
- $MAVEN test
only:
variables:
- $OSDU_GCP == 'true'
\ No newline at end of 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