Updated pipelines for indexer and search testing

README.md

@@ -451,7 +451,6 @@ done
 | SERVICE_RESOURCE_NAME | `$(AZURE_PARTITION_SERVICE_NAME)` |
 
 
-
 - __Setup and Configure the ADO Library__ `Azure Service Release - entitlements-azure`
 
 | Variable | Value |
@@ -462,7 +461,6 @@ done
 | SERVICE_RESOURCE_NAME | `$(AZURE_ENTITLEMENTS_SERVICE_NAME)` |
 
 
-
 - __Setup and Configure the ADO Library__ `Azure Service Release - legal`
 
 | Variable | Value |
@@ -473,7 +471,6 @@ done
 | SERVICE_RESOURCE_NAME | `$(AZURE_LEGAL_SERVICE_NAME)` |
 
 
-
 __- Setup and Configure the ADO Library__ `Azure Service Release - storage`
 
 | Variable | Value |
@@ -484,28 +481,27 @@ __- Setup and Configure the ADO Library__ `Azure Service Release - storage`
 | SERVICE_RESOURCE_NAME | `$(AZURE_STORAGE_SERVICE_NAME)` |
 
 
-
 __- Setup and Configure the ADO Library__ `Azure Service Release - indexer-service`
 
 | 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=contoso.com -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)` |
 
 
-
 __- Setup and Configure the ADO Library__ `Azure Service Release - search-service`
 
 | Variable | Value |
 |----------|-------|
 | MAVEN_DEPLOY_POM_FILE_PATH | `drop/provider/search-azure` |
-| MAVEN_INTEGRATION_TEST_OPTIONS | `-DSEARCH_HOST=$(SEARCH_URL)api/search/v2/ -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) -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_POM_FILE_PATH | `drop/deploy/testing/integration-tests/search-test-azure` |
 | SERVICE_RESOURCE_NAME | `$(AZURE_SEARCH_SERVICE_NAME)` |
 
 
+
 ### Load Storage Container Integration Test Data
 
 The data to be loaded before services are deployed and can be found in the osdu-infrastructure repository `osdu-infrastructure/docs/osdu/integration-test-data/`.

devops/tasks/elastic-setup.yml

@@ -48,5 +48,5 @@ steps:
         echo "  elastic port: $port"
         echo "  elastic username: $ELASTIC_USERNAME"
         echo "  elastic password: $ELASTIC_PASSWORD"
-        echo "##vso[task.setvariable variable=elastic-host;]$host"
-        echo "##vso[task.setvariable variable=elastic-port;]$port"
+        echo "##vso[task.setvariable variable=ELASTIC_HOST;]$host"
+        echo "##vso[task.setvariable variable=ELASTIC_PORT;]$port"