Commit 8debfc82 authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Merge branch 'trusted-azure' into 'master'

Build Variables

See merge request osdu/platform/ci-cd-pipelines!14
parents 3d1a5fb0 0615e66b
......@@ -35,7 +35,8 @@
ENTITLEMENT_URL: https://${AZURE_BASENAME_21}-au-entitlements.azurewebsites.net/
LEGAL_URL: https://${AZURE_BASENAME_21}-au-legal.azurewebsites.net/
STORAGE_URL: https://${AZURE_BASENAME_21}-au-storage.azurewebsites.net/
SEARCH_HOST: https://${AZURE_BASENAME_21}-au-search.azurewebsites.net//api/search/v2/
SEARCH_URL: https://${AZURE_BASENAME_21}-au-search.azurewebsites.net/api/search/v2/
INDEXER_URL: https://${AZURE_BASENAME_21}-au-indexer.azurewebsites.net/
AZURE_AD_TENANT_ID: $AZURE_TENANT_ID
INTEGRATION_TESTER: $AZURE_PRINCIPAL_ID
AZURE_TESTER_SERVICEPRINCIPAL_SECRET: $AZURE_PRINCIPAL_SECRET
......@@ -67,8 +68,13 @@
PUBSUB_TOKEN: az
DEPLOY_ENV: empty
# Indexer & Search Section
<<<<<<< HEAD
SEARCH_HOST: https://${AZURE_BASENAME_21}-au-search.azurewebsites.net/api/search/v2/
=======
aad_client_id: $AZURE_APP_ID
>>>>>>> master
STORAGE_HOST: https://${AZURE_BASENAME_21}-au-storage.azurewebsites.net/
aad_client_id: $AZURE_APP_ID
DEFAULT_DATA_PARTITION_ID_TENANT1: opendes
DEFAULT_DATA_PARTITION_ID_TENANT2: common
ENTITLEMENTS_DOMAIN: contoso.com
......@@ -122,6 +128,11 @@ azure_debug:
echo "export ENTITLEMENT_URL=\"$ENTITLEMENT_URL\""
echo "export LEGAL_URL=\"$LEGAL_URL\""
echo "export STORAGE_URL=\"$STORAGE_URL\""
<<<<<<< HEAD
echo "export SEARCH_URL=\"$SEARCH_URL\""
echo "export INDEXER_URL=\"$INDEXER_URL\""
=======
>>>>>>> master
echo "export INTEGRATION_TESTER=\"\$AZURE_PRINCIPAL_ID\""
echo "export AZURE_TESTER_SERVICEPRINCIPAL_SECRET=\"\$AZURE_PRINCIPAL_SECRET\""
echo "export AZURE_AD_APP_RESOURCE_ID=\"$AZURE_AD_APP_RESOURCE_ID\""
......@@ -155,8 +166,9 @@ azure_debug:
echo "export DEPLOY_ENV=\"$DEPLOY_ENV\""
echo ""
echo "# Index Section"
echo "export aad_client_id=\"$aad_client_id\""
echo "export SEARCH_HOST=\"$SEARCH_HOST\""
echo "export STORAGE_HOST=\"$STORAGE_HOST\""
echo "export aad_client_id=\"$aad_client_id\""
echo "export ELASTIC_HOST=\"$ELASTIC_HOST\""
echo "export ELASTIC_USER_NAME=\"$ELASTIC_USER_NAME\""
echo "export DEFAULT_DATA_PARTITION_ID_TENANT1=\"$DEFAULT_DATA_PARTITION_ID_TENANT1\""
......@@ -244,7 +256,8 @@ azure_config:
before_script:
- az login --service-principal -u $AZURE_PRINCIPAL_ID -p $AZURE_PRINCIPAL_SECRET --tenant $AZURE_TENANT_ID
script:
- TARGET=$(find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' | head -n 1)
- find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' | sort -rz
- TARGET=$(find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' | sort -rz | head -n 1)
- JAR_FILE=${TARGET##*/}
- echo "Startup Jar is $JAR_FILE"
- JAVA_COMMAND="java -jar /home/site/wwwroot/${JAR_FILE}"
......
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