Commit 7438d1fd authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Merge branch 'heitz/doc-fix' into 'master'

Fix REGISTER_BASE_URL variable name

See merge request osdu/platform/deployment-and-operations/infra-azure-provisioning!171
parents 07d4c55e a88457fd
......@@ -498,7 +498,7 @@ This variable group is the service specific variables necessary for testing and
| Variable | Value |
|----------|-------|
| MAVEN_DEPLOY_POM_FILE_PATH | `drop/provider/register-azure` |
| MAVEN_INTEGRATION_TEST_OPTIONS | `-DargLine="-DREGISTER_BASE_URL_URL=$(REGISTER_BASE_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DNO_DATA_ACCESS_TESTER=$(NO_DATA_ACCESS_TESTER) -DNO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET=$(NO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET) -DENVIRONMENT=DEV -DSUBSCRIBER_SECRET=$(AZURE_EVENT_SUBSCRIBER_SECRET) -DTEST_TOPIC_NAME=$(AZURE_EVENT_TOPIC_NAME) -DSUBSCRIPTION_ID=$(AZURE_EVENT_SUBSCRIPTION_ID)"` |
| MAVEN_INTEGRATION_TEST_OPTIONS | `-DargLine="-DREGISTER_BASE_URL=$(REGISTER_BASE_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DNO_DATA_ACCESS_TESTER=$(NO_DATA_ACCESS_TESTER) -DNO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET=$(NO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET) -DENVIRONMENT=DEV -DSUBSCRIBER_SECRET=$(AZURE_EVENT_SUBSCRIBER_SECRET) -DTEST_TOPIC_NAME=$(AZURE_EVENT_TOPIC_NAME) -DSUBSCRIPTION_ID=$(AZURE_EVENT_SUBSCRIPTION_ID)"` |
| MAVEN_INTEGRATION_TEST_POM_FILE_PATH | `drop/deploy/testing/register-test-azure/pom.xml` |
| SERVICE_RESOURCE_NAME | `$(AZURE_REGISTER_SERVICE_NAME)` |
......@@ -508,7 +508,7 @@ az pipelines variable-group create \
--authorize true \
--variables \
MAVEN_DEPLOY_POM_FILE_PATH="drop/provider/register-azure" \
MAVEN_INTEGRATION_TEST_OPTIONS='-DargLine="-DREGISTER_BASE_URL_URL=$(REGISTER_BASE_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DNO_DATA_ACCESS_TESTER=$(NO_DATA_ACCESS_TESTER) -DNO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET=$(NO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET) -DENVIRONMENT=DEV -DSUBSCRIBER_SECRET=$(AZURE_EVENT_SUBSCRIBER_SECRET) -DTEST_TOPIC_NAME=$(AZURE_EVENT_TOPIC_NAME) -DSUBSCRIPTION_ID=$(AZURE_EVENT_SUBSCRIPTION_ID)"' \
MAVEN_INTEGRATION_TEST_OPTIONS='-DargLine="-DREGISTER_BASE_URL=$(REGISTER_BASE_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DNO_DATA_ACCESS_TESTER=$(NO_DATA_ACCESS_TESTER) -DNO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET=$(NO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET) -DENVIRONMENT=DEV -DSUBSCRIBER_SECRET=$(AZURE_EVENT_SUBSCRIBER_SECRET) -DTEST_TOPIC_NAME=$(AZURE_EVENT_TOPIC_NAME) -DSUBSCRIPTION_ID=$(AZURE_EVENT_SUBSCRIPTION_ID)"' \
MAVEN_INTEGRATION_TEST_POM_FILE_PATH="drop/deploy/testing/register-test-azure/pom.xml" \
SERVICE_RESOURCE_NAME='$(AZURE_REGISTER_SERVICE_NAME)' \
-ojson
......
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