Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
Deployment and Operations
infra-azure-provisioning
Commits
58c84ad5
Commit
58c84ad5
authored
Oct 23, 2020
by
Daniel Scholl
Browse files
Merge branch 'legal_fix' into 'master'
Legal fix See merge request
!41
parents
72157ce7
f5ecb782
Changes
1
Hide whitespace changes
Inline
Side-by-side
docs/service-automation.md
View file @
58c84ad5
...
...
@@ -20,6 +20,7 @@ This variable group will be used to hold the common values for the services to b
| EXPIRED_TOKEN |
<an_expired_token>
|
| HOST_URL |
`https://<your_fqdn>/`
|
| LEGAL_URL |
`https://<your_fqdn>/api/legal/v1/`
|
| STORAGE_URL |
`https://<your_fqdn>/api/storage/v2/`
|
| NO_DATA_ACCESS_TESTER |
`$(osdu-mvp-<your_unique>-noaccess-clientid)`
|
| NO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET |
`$(osdu-mvp-<your_unique>-noaccess-secret)`
|
| PUBSUB_TOKEN |
`az`
|
...
...
@@ -51,6 +52,7 @@ az pipelines variable-group create \
EXPIRED_TOKEN
=
$INVALID_TOKEN
\
HOST_URL
=
"https://
${
DNS_HOST
}
/"
\
LEGAL_URL
=
"https://
${
DNS_HOST
}
/api/legal/v1/"
\
STORAGE_URL
=
"https://
${
DNS_HOST
}
/api/storage/v2/"
\
NO_DATA_ACCESS_TESTER
=
'$(osdu-mvp-'
${
UNIQUE
}
'-noaccess-clientid)'
\
NO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET
=
'$(osdu-mvp-'
${
UNIQUE
}
'-noaccess-secret))'
\
PUBSUB_TOKEN
=
"az"
\
...
...
@@ -92,6 +94,8 @@ This variable group will be used to hold the specific environment values necessa
| DNS_HOST |
<your_FQDN>
|
| DOMAIN |
`contoso.com`
|
| ELASTIC_ENDPOINT |
`$(opendes-elastic-endpoint)`
|
| ELASTIC_USERNAME |
`$(opendes-elastic-username)`
|
| ELASTIC_PASSWORD |
`$(opendes-elastic-password)`
|
| IDENTITY_CLIENT_ID |
`$(identity_id)`
|
| INTEGRATION_TESTER |
`$(app-dev-sp-username)`
|
| MY_TENANT |
`opendes`
|
...
...
@@ -116,6 +120,8 @@ az pipelines variable-group create \
DNS_HOST
=
"
$DNS_HOST
"
\
DOMAIN
=
"contoso.com"
\
ELASTIC_ENDPOINT
=
'$('
${
DATA_PARTITION_NAME
}
'-elastic-endpoint)'
\
ELASTIC_USERNAME
=
'$('
${
DATA_PARTITION_NAME
}
'-elastic-username)'
\
ELASTIC_PASSWORD
=
'$('
${
DATA_PARTITION_NAME
}
'-elastic-password)'
\
IDENTITY_CLIENT_ID
=
'$(identity_id)'
\
INTEGRATION_TESTER
=
'$(app-dev-sp-username)'
\
MY_TENANT
=
"
$DATA_PARTITION_NAME
"
\
...
...
@@ -143,6 +149,10 @@ This variable group is a linked variable group that links to the Environment Key
-
{partition-name}-elastic-endpoint
-
{partition-name}-elastic-password
-
{partition-name}-elastic-username
-
{partition-name}-storage
-
{partition-name}-storage-key
-
{partition-name}-sb-connection
-
{partition-name}-sb-namespace
-
osdu-identity-id
-
subscription-id
-
tenant-id
...
...
@@ -226,7 +236,7 @@ This variable group is the service specific variables necessary for testing and
| Variable | Value |
|----------|-------|
| MAVEN_DEPLOY_POM_FILE_PATH |
`drop/provider/storage-azure`
|
| MAVEN_INTEGRATION_TEST_OPTIONS |
`-DSTORAGE_URL=$(STORAGE_URL) -DLEGAL_URL=$(LEGAL_URL) -DTENANT_NAME=$(MY_TENANT) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_STORAGE_ACCOUNT=$(STORAGE_ACCOUNT) -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) -DDOMAIN=$(DOMAIN) -DPUBSUB_TOKEN=$(PUBSUB_TOKEN) -DDEPLOY_ENV=
$(DEPLOY_ENV)
`
|
| MAVEN_INTEGRATION_TEST_OPTIONS |
`-DSTORAGE_URL=$(STORAGE_URL) -DLEGAL_URL=$(LEGAL_URL) -DTENANT_NAME=$(MY_TENANT) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_STORAGE_ACCOUNT=$(STORAGE_ACCOUNT) -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) -DDOMAIN=$(DOMAIN) -DPUBSUB_TOKEN=$(PUBSUB_TOKEN) -DDEPLOY_ENV=
empty
`
|
| MAVEN_INTEGRATION_TEST_POM_FILE_PATH |
`drop/deploy/testing/storage-test-azure`
|
| SERVICE_RESOURCE_NAME |
`$(AZURE_STORAGE_SERVICE_NAME)`
|
...
...
@@ -236,7 +246,7 @@ az pipelines variable-group create \
--authorize
true
\
--variables
\
MAVEN_DEPLOY_POM_FILE_PATH
=
"drop/provider/storage-azure"
\
MAVEN_INTEGRATION_TEST_OPTIONS
=
'-DSTORAGE_URL=$(STORAGE_URL) -DLEGAL_URL=$(LEGAL_URL) -DTENANT_NAME=$(MY_TENANT) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_STORAGE_ACCOUNT=$(STORAGE_ACCOUNT) -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) -DDOMAIN=$(DOMAIN) -DPUBSUB_TOKEN=$(PUBSUB_TOKEN) -DDEPLOY_ENV=
$(DEPLOY_ENV)
'
\
MAVEN_INTEGRATION_TEST_OPTIONS
=
'-DSTORAGE_URL=$(STORAGE_URL) -DLEGAL_URL=$(LEGAL_URL) -DTENANT_NAME=$(MY_TENANT) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_STORAGE_ACCOUNT=$(STORAGE_ACCOUNT) -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) -DDOMAIN=$(DOMAIN) -DPUBSUB_TOKEN=$(PUBSUB_TOKEN) -DDEPLOY_ENV=
empty
'
\
MAVEN_INTEGRATION_TEST_POM_FILE_PATH
=
"drop/deploy/testing/storage-test-azure"
\
SERVICE_RESOURCE_NAME
=
'$(AZURE_STORAGE_SERVICE_NAME)'
\
-ojson
...
...
@@ -250,7 +260,7 @@ This variable group is the service specific variables necessary for testing and
| Variable | Value |
|----------|-------|
| MAVEN_DEPLOY_POM_FILE_PATH |
`drop/provider/indexer-azure`
|
| MAVEN_INTEGRATION_TEST_OPTIONS |
`-DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -Daad_client_id=$(AZURE_AD_APP_RESOURCE_ID) -DSTORAGE_HOST=$(STORAGE_URL) -DELASTIC_HOST=$(ELASTIC_HOST) -DELASTIC_PORT=$(ELASTIC_PORT) -DELASTIC_USER_NAME=$(ELASTIC_USERNAME) -DELASTIC_PASSWORD=$(ELASTIC_PASSWORD) -DDEFAULT_DATA_PARTITION_ID_TENANT1=$(MY_TENANT) -DDEFAULT_DATA_PARTITION_ID_TENANT2=othertenant2 -DENTITLEMENTS_DOMAIN=
contoso.com
-DENVIRONMENT=CLOUD -DLEGAL_TAG=opendes-public-usa-dataset-7643990 -DOTHER_RELEVANT_DATA_COUNTRIES=US`
|
| MAVEN_INTEGRATION_TEST_OPTIONS |
`-DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -Daad_client_id=$(AZURE_AD_APP_RESOURCE_ID) -DSTORAGE_HOST=$(STORAGE_URL) -DELASTIC_HOST=$(ELASTIC_HOST) -DELASTIC_PORT=$(ELASTIC_PORT) -DELASTIC_USER_NAME=$(ELASTIC_USERNAME) -DELASTIC_PASSWORD=$(ELASTIC_PASSWORD) -DDEFAULT_DATA_PARTITION_ID_TENANT1=$(MY_TENANT) -DDEFAULT_DATA_PARTITION_ID_TENANT2=othertenant2 -DENTITLEMENTS_DOMAIN=
$(DOMAIN)
-DENVIRONMENT=CLOUD -DLEGAL_TAG=opendes-public-usa-dataset-7643990 -DOTHER_RELEVANT_DATA_COUNTRIES=US`
|
| MAVEN_INTEGRATION_TEST_POM_FILE_PATH |
`drop/deploy/testing/indexer-test-azure`
|
| SERVICE_RESOURCE_NAME |
`$(AZURE_INDEXER_SERVICE_NAME)`
|
...
...
@@ -260,7 +270,7 @@ az pipelines variable-group create \
--authorize
true
\
--variables
\
MAVEN_DEPLOY_POM_FILE_PATH
=
"drop/provider/indexer-azure"
\
MAVEN_INTEGRATION_TEST_OPTIONS
=
'-DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -Daad_client_id=$(AZURE_AD_APP_RESOURCE_ID) -DSTORAGE_HOST=$(STORAGE_URL) -DELASTIC_HOST=$(ELASTIC_HOST) -DELASTIC_PORT=$(ELASTIC_PORT) -DELASTIC_USER_NAME=$(ELASTIC_USERNAME) -DELASTIC_PASSWORD=$(ELASTIC_PASSWORD) -DDEFAULT_DATA_PARTITION_ID_TENANT1=$(MY_TENANT) -DDEFAULT_DATA_PARTITION_ID_TENANT2=othertenant2 -DENTITLEMENTS_DOMAIN=
contoso.com
-DENVIRONMENT=CLOUD -DLEGAL_TAG=opendes-public-usa-dataset-7643990 -DOTHER_RELEVANT_DATA_COUNTRIES=US'
\
MAVEN_INTEGRATION_TEST_OPTIONS
=
'-DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -Daad_client_id=$(AZURE_AD_APP_RESOURCE_ID) -DSTORAGE_HOST=$(STORAGE_URL) -DELASTIC_HOST=$(ELASTIC_HOST) -DELASTIC_PORT=$(ELASTIC_PORT) -DELASTIC_USER_NAME=$(ELASTIC_USERNAME) -DELASTIC_PASSWORD=$(ELASTIC_PASSWORD) -DDEFAULT_DATA_PARTITION_ID_TENANT1=$(MY_TENANT) -DDEFAULT_DATA_PARTITION_ID_TENANT2=othertenant2 -DENTITLEMENTS_DOMAIN=
$(DOMAIN)
-DENVIRONMENT=CLOUD -DLEGAL_TAG=opendes-public-usa-dataset-7643990 -DOTHER_RELEVANT_DATA_COUNTRIES=US'
\
MAVEN_INTEGRATION_TEST_POM_FILE_PATH
=
"drop/deploy/testing/indexer-test-azure"
\
SERVICE_RESOURCE_NAME
=
'$(AZURE_INDEXER_SERVICE_NAME)'
\
-ojson
...
...
@@ -275,7 +285,7 @@ This variable group is the service specific variables necessary for testing and
| Variable | Value |
|----------|-------|
| MAVEN_DEPLOY_POM_FILE_PATH |
`drop/provider/search-azure`
|
| MAVEN_INTEGRATION_TEST_OPTIONS |
`-DSEARCH_HOST=$(SEARCH_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -D
INDEXER
_HOST=$(
) -D
STORAGE_
HOST=$(
) -DELASTIC_HOST=$(ELASTIC_HOST) -DELASTIC_PORT=$(ELASTIC_PORT) -DELASTIC_USER_NAME=$(ELASTIC_USERNAME) -DELASTIC_PASSWORD=$(ELASTIC_PASSWORD) -DDEFAULT_DATA_PARTITION_ID_TENANT1=$(MY_TENANT) -DDEFAULT_DATA_PARTITION_ID_TENANT2=othertenant2 -DENTITLEMENTS_DOMAIN=$(DOMAIN)`
|
| MAVEN_INTEGRATION_TEST_OPTIONS |
`-DSEARCH_HOST=$(SEARCH_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -D
STORAGE
_HOST=$(STORAGE_
URL
) -DELASTIC_HOST=$(ELASTIC_HOST) -DELASTIC_PORT=$(ELASTIC_PORT) -DELASTIC_USER_NAME=$(ELASTIC_USERNAME) -DELASTIC_PASSWORD=$(ELASTIC_PASSWORD) -DDEFAULT_DATA_PARTITION_ID_TENANT1=$(MY_TENANT) -DDEFAULT_DATA_PARTITION_ID_TENANT2=othertenant2 -DENTITLEMENTS_DOMAIN=$(DOMAIN)`
|
| MAVEN_INTEGRATION_TEST_POM_FILE_PATH |
`drop/deploy/testing/integration-tests/search-test-azure`
|
| SERVICE_RESOURCE_NAME |
`$(AZURE_SEARCH_SERVICE_NAME)`
|
...
...
@@ -285,7 +295,7 @@ az pipelines variable-group create \
--authorize
true
\
--variables
\
MAVEN_DEPLOY_POM_FILE_PATH
=
"drop/provider/search-azure"
\
MAVEN_INTEGRATION_TEST_OPTIONS
=
'-DSEARCH_HOST=$(SEARCH_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID)
-DINDEXER_HOST=$()
-DSTORAGE_HOST=$() -DELASTIC_HOST=$(ELASTIC_HOST) -DELASTIC_PORT=$(ELASTIC_PORT) -DELASTIC_USER_NAME=$(ELASTIC_USERNAME) -DELASTIC_PASSWORD=$(ELASTIC_PASSWORD) -DDEFAULT_DATA_PARTITION_ID_TENANT1=$(MY_TENANT) -DDEFAULT_DATA_PARTITION_ID_TENANT2=othertenant2 -DENTITLEMENTS_DOMAIN=$(DOMAIN)'
\
MAVEN_INTEGRATION_TEST_OPTIONS
=
'-DSEARCH_HOST=$(SEARCH_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DSTORAGE_HOST=$(
STORAGE_URL
) -DELASTIC_HOST=$(ELASTIC_HOST) -DELASTIC_PORT=$(ELASTIC_PORT) -DELASTIC_USER_NAME=$(ELASTIC_USERNAME) -DELASTIC_PASSWORD=$(ELASTIC_PASSWORD) -DDEFAULT_DATA_PARTITION_ID_TENANT1=$(MY_TENANT) -DDEFAULT_DATA_PARTITION_ID_TENANT2=othertenant2 -DENTITLEMENTS_DOMAIN=$(DOMAIN)'
\
MAVEN_INTEGRATION_TEST_POM_FILE_PATH
=
"drop/deploy/testing/integration-tests/search-test-azure"
\
SERVICE_RESOURCE_NAME
=
'$(AZURE_SEARCH_SERVICE_NAME)'
\
-ojson
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment