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

Merge branch 'osdu-gcp-add-vars-for-int-tests' into 'master'

Refactor variables

See merge request !64
parents b68d69cc f24b351a
Pipeline #9068 passed with stages
in 14 seconds
......@@ -26,9 +26,9 @@
variables:
#services' urls
OSDU_GCP_ENTITLEMENTS_URL: https://os-entitlements-gcp-attcrcktoa-uc.a.run.app/entitlements/v1/
OSDU_GCP_AUTHORIZE_API: $OSDU_GCP_ENTITLEMENTS_URL
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/
OSDU_GCP_RECORDS_ROOT_URL: $OSDU_GCP_STORAGE_URL
OSDU_GCP_RECORDS_ROOT_URL: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2/
OSDU_GCP_LEGAL_HOST_URL: https://os-legal-dot-nice-etching-277309.uc.r.appspot.com/api/legal/v1/
OSDU_GCP_AIRFLOW_URL: https://c410714dc037b0e02p-tp.appspot.com
OSDU_GCP_DELIVERY_SERVICE_URL: https://os-file-attcrcktoa-uc.a.run.app
......@@ -37,39 +37,33 @@
OSDU_GCP_SEARCH_HOST: https://os-search-dot-nice-etching-277309.uc.r.appspot.com/api/search/v2/
OSDU_GCP_SEARCH_QUERY_URL: https://os-search-dot-nice-etching-277309.uc.r.appspot.com//api/search/v2/query
OSDU_GCP_INDEXER_HOST: https://os-indexer-dot-nice-etching-277309.uc.r.appspot.com/
# env parameters
OSDU_GCP_INTEGRATION_TEST_AUDIENCE: 689762842995-pv217jo3k8j803kk6gqf52qb5amos3a9.apps.googleusercontent.com
OSDU_GCP_DEPLOY_ENV: dev
OSDU_GCP_DOMAIN: osdu-gcp.go3-nrg.projects.epam.com
OSDU_GCP_TENANT_NAME: osdu
OSDU_GCP_MY_TENANT_PROJECT: osdu
OSDU_GCP_MY_TENANT: osdu
OSDU_GCP_FILE_URL: https://os-file-attcrcktoa-uc.a.run.app
# common variables
OSDU_GCP_CLOUDRUN_REGION: us-central1
OSDU_GCP_PROJECT: nice-etching-277309
OSDU_GCP_VPC_CONNECTOR: osdu-connector
# common integration tests variables
GOOGLE_AUDIENCE: $OSDU_GCP_INTEGRATION_TEST_AUDIENCE
DOMAIN: $OSDU_GCP_DOMAIN
OTHER_RELEVANT_DATA_COUNTRIES: US
# common variables for tests
GOOGLE_AUDIENCE: 689762842995-pv217jo3k8j803kk6gqf52qb5amos3a9.apps.googleusercontent.com
DOMAIN: osdu-gcp.go3-nrg.projects.epam.com
LEGAL_TAG: osdu-demo-legaltag
GCLOUD_PROJECT: $OSDU_GCP_PROJECT
# integration test variables for ingestion workflow
WORKFLOW_HOST: $OSDU_GCP_WORKFLOW_SERVICE_URL
OTHER_RELEVANT_DATA_COUNTRIES: US
DEFAULT_DATA_PARTITION_ID_TENANT1: osdu
GCLOUD_PROJECT: nice-etching-277309
# variables for workflow tests
FINISHED_WORKFLOW_ID: fad778da-fbc4-4261-8b3e-deb48be44969
TEST_FILE_ID: $OSDU_GCP_TEST_FILE_ID
# integration test variables for ingestion service
DEFAULT_DATA_PARTITION_ID_TENANT1: $OSDU_GCP_TENANT_NAME
DEFAULT_DATA_PARTITION_ID_TENANT2: $OSDU_GCP_TENANT_NAME
INGEST_HOST: $OSDU_GCP_INGEST_HOST
# variables for ingestion tests
TEST_OSDU_FILE_PATH: gs://nice-etching-277309-file/r1/data/provided/well-logs/1013_akm11_1978_comp.las
# integration test variables for delivery service
STORAGE_HOST: $OSDU_GCP_STORAGE_URL
ENTITLEMENTS_DOMAIN: $OSDU_GCP_DOMAIN
TENANT: $OSDU_GCP_TENANT_NAME
SEARCH_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
INTEGRATION_TEST_AUDIENCE: $OSDU_GCP_INTEGRATION_TEST_AUDIENCE
SEARCH_HOST: $OSDU_GCP_SEARCH_HOST
DELIVERY_HOST: $OSDU_GCP_DELIVERY_SERVICE_URL
# variables for file tests
TARGET_AUDIENCE: 689762842995-pv217jo3k8j803kk6gqf52qb5amos3a9.apps.googleusercontent.com
DATA_PARTITION_ID: osdu
USER_ID: common-user
TIME_ZONE: UTC+0
FILE_BUCKET: nice-etching-277309-file
# variables for delivery tests
ENTITLEMENTS_DOMAIN: osdu-gcp.go3-nrg.projects.epam.com
TENANT: osdu
DEFAULT_DATA_PARTITION_ID_TENANT2: osdu
INTEGRATION_TEST_AUDIENCE: 689762842995-pv217jo3k8j803kk6gqf52qb5amos3a9.apps.googleusercontent.com
osdu-gcp-containerize:
stage: containerize
......@@ -111,6 +105,14 @@ osdu-gcp-test:
- 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:
......
......@@ -2,9 +2,8 @@
variables:
# service's URLs
OSDU_GCP_ENTITLEMENTS_URL: https://os-entitlements-gcp-attcrcktoa-uc.a.run.app/entitlements/v1/
OSDU_GCP_AUTHORIZE_API: $OSDU_GCP_ENTITLEMENTS_URL
OSDU_GCP_STORAGE_URL: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2/
OSDU_GCP_RECORDS_ROOT_URL: $OSDU_GCP_STORAGE_URL
OSDU_GCP_RECORDS_ROOT_URL: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2/
OSDU_GCP_LEGAL_HOST_URL: https://os-legal-dot-nice-etching-277309.uc.r.appspot.com/api/legal/v1/
OSDU_GCP_AIRFLOW_URL: https://c410714dc037b0e02p-tp.appspot.com
OSDU_GCP_DELIVERY_SERVICE_URL: https://os-file-attcrcktoa-uc.a.run.app
......@@ -13,36 +12,25 @@
OSDU_GCP_SEARCH_HOST: https://os-search-dot-nice-etching-277309.uc.r.appspot.com/api/search/v2/
OSDU_GCP_SEARCH_QUERY_URL: https://os-search-dot-nice-etching-277309.uc.r.appspot.com//api/search/v2/query
OSDU_GCP_INDEXER_HOST: https://os-indexer-dot-nice-etching-277309.uc.r.appspot.com/
OSDU_GCP_FILE_URL: https://os-file-attcrcktoa-uc.a.run.app
# variables for integration tests
OSDU_GCP_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
OSDU_GCP_NO_DATA_ACCESS_TESTER: $OSDU_GCP_NO_DATA_ACCESS_TESTER
OSDU_GCP_PUBSUB_TOKEN: $OSDU_GCP_PUBSUB_TOKEN
OSDU_GCP_DEPLOY_ENV: empty
OSDU_GCP_DOMAIN: osdu-gcp.go3-nrg.projects.epam.com
OSDU_GCP_TENANT_NAME: osdu
OSDU_GCP_MY_TENANT_PROJECT: $OSDU_GCP_TENANT_NAME
OSDU_GCP_MY_TENANT: $OSDU_GCP_TENANT_NAME
OSDU_GCP_INTEGRATION_TEST_AUDIENCE: 689762842995-pv217jo3k8j803kk6gqf52qb5amos3a9.apps.googleusercontent.com
OSDU_GCP_VENDOR: gcp
OSDU_GCP_PROJECT: nice-etching-277309
# integration test variables for search service
DEPLOY_ENV: empty
DOMAIN: osdu-gcp.go3-nrg.projects.epam.com
ENTITLEMENTS_DOMAIN: osdu-gcp.go3-nrg.projects.epam.com
ENTITLEMENTS_HOST: $OSDU_GCP_ENTITLEMENTS_URL
DEFAULT_DATA_PARTITION_ID_TENANT1: $OSDU_GCP_TENANT_NAME
DEFAULT_DATA_PARTITION_ID_TENANT2: $OSDU_GCP_TENANT_NAME
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
GCLOUD_PROJECT: $OSDU_GCP_PROJECT
INDEXER_HOST: $OSDU_GCP_INDEXER_HOST
DATA_GROUP: $OSDU_GCP_TENANT_NAME
TENANT_NAME: osdu
MY_TENANT_PROJECT: osdu
MY_TENANT: osdu
DATA_GROUP: osdu
DEFAULT_DATA_PARTITION_ID_TENANT1: osdu
DEFAULT_DATA_PARTITION_ID_TENANT2: osdu
INTEGRATION_TEST_AUDIENCE: 689762842995-pv217jo3k8j803kk6gqf52qb5amos3a9.apps.googleusercontent.com
INT_TEST_VENDOR: gcp
PROJECT: nice-etching-277309
GCLOUD_PROJECT: nice-etching-277309
LEGAL_TAG: osdu-demo-legaltag
OTHER_RELEVANT_DATA_COUNTRIES: US
INTEGRATION_TEST_AUDIENCE: $OSDU_GCP_INTEGRATION_TEST_AUDIENCE
SEARCH_INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
SEARCH_HOST: $OSDU_GCP_SEARCH_HOST
.osdu-gcp:
tags: ["osdu-medium"]
......@@ -83,28 +71,27 @@ osdu-gcp-test:
needs: ["osdu-gcp-deploy"]
script:
- cd $OSDU_GCP_INT_TEST_SUBDIR
- echo $OSDU_GCP_DEPLOY_ENV $DEPLOY_ENV
- |
$MAVEN test \
-DINTEGRATION_TESTER=${OSDU_GCP_INTEGRATION_TESTER} \
-DNO_DATA_ACCESS_TESTER=${OSDU_GCP_NO_DATA_ACCESS_TESTER} \
-DPUBSUB_TOKEN=${OSDU_GCP_PUBSUB_TOKEN} \
-DSTORAGE_URL=${OSDU_GCP_STORAGE_URL} \
-DDEPLOY_ENV=${OSDU_GCP_DEPLOY_ENV} \
-DDOMAIN=${OSDU_GCP_DOMAIN} \
-DTENANT_NAME=${OSDU_GCP_TENANT_NAME} \
-DAUTHORIZE_API=${OSDU_GCP_AUTHORIZE_API} \
-DMY_TENANT_PROJECT=${OSDU_GCP_MY_TENANT_PROJECT} \
-DHOST_URL=${OSDU_GCP_LEGAL_HOST_URL} \
-DINTEGRATION_TEST_AUDIENCE=${OSDU_GCP_INTEGRATION_TEST_AUDIENCE} \
-DMY_TENANT=${OSDU_GCP_MY_TENANT} \
-DENTITLEMENT_URL=${OSDU_GCP_ENTITLEMENT_URL} \
-DGCLOUD_PROJECT=${OSDU_GCP_MY_TENANT_PROJECT} \
-DENVIRONMENT=${OSDU_GCP_DEPLOY_ENV} \
-DSTORAGE_URL=${OSDU_GCP_STORAGE_URL} \
-DINT_TEST_VENDOR=${OSDU_GCP_VENDOR} \
-DTENANT_GCP=${OSDU_GCP_MY_TENANT_PROJECT} \
-DLEGAL_URL=${OSDU_GCP_LEGAL_HOST_URL}
# 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
# 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
# start tests
- $MAVEN test
only:
variables:
- $OSDU_GCP == 'true'
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