Commit 0e575eac authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Azure Build Variable Updates

parent c8fa5e69
......@@ -9,8 +9,9 @@
# AZURE_ELASTIC_HOST (Protected Branch)
# AZURE_ELASTIC_PASSWORD (Protected Branch/Masked Variable)
# AZURE_INVALID_JWT (Protected Branch)
# AZURE_NO_ACCESS_ID (Protected Branch)
# AZURE_NO_ACCESS_SECRET (Protected Branch/Masked Variable)
# AZURE_PRINCIPAL_ID (Protected Branch/Masked Variable)
# AZURE_PRINCIPAL_ID (Protected Branch)
# AZURE_PRINCIPAL_SECRET (Protected Branch/Masked Variable)
# AZURE_SERVICEBUS_KEY (Protected Branch/Masked Variable)
# AZURE_STORAGE_KEY (Protected Branch/Masked Variable)
......@@ -42,7 +43,6 @@
AZURE_STORAGE_ACCOUNT: ${AZURE_BASE}sa
MY_TENANT: opendes
DOMAIN: contoso.com
AZURE_NO_ACCESS_ID: 31225e68-0944-4b6a-b0bb-ef303ae57f16
ELASTIC_HOST: $AZURE_ELASTIC_HOST
ELASTIC_PORT: 9243
ELASTIC_USER_NAME: elastic
......@@ -54,7 +54,7 @@
ENTITLEMENT_GROUP_NAME_VALID: integ.test.data.creator
ENTITLEMENT_MEMBER_NAME_INVALID: InvalidTestAdmin
# Legal Section
AZURE_LEGAL_STORAGE_ACCOUNT: $AZURE_STORAGE_ACCOUNT
AZURE_LEGAL_STORAGE_ACCOUNT: ${AZURE_BASE}sa
AZURE_LEGAL_STORAGE_KEY: $AZURE_STORAGE_KEY
LEGAL_STORAGE_CONTAINER: legal-service-azure-configuration
AZURE_LEGAL_SERVICEBUS: Endpoint=sb://${AZURE_BASENAME_21}sb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=${AZURE_SERVICEBUS_KEY}
......@@ -67,7 +67,7 @@
PUBSUB_TOKEN: az
DEPLOY_ENV: empty
# Indexer & Search Section
aad_client_id: $AZURE_AD_APP_RESOURCE_ID
aad_client_id: $AZURE_APP_ID
STORAGE_HOST: https://${AZURE_BASENAME_21}-au-storage.azurewebsites.net/
DEFAULT_DATA_PARTITION_ID_TENANT1: opendes
DEFAULT_DATA_PARTITION_ID_TENANT2: common
......@@ -122,7 +122,6 @@ azure_debug:
echo "export ENTITLEMENT_URL=\"$ENTITLEMENT_URL\""
echo "export LEGAL_URL=\"$LEGAL_URL\""
echo "export STORAGE_URL=\"$STORAGE_URL\""
echo "export AZURE_AD_TENANT_ID=\"$STORAGE_URL\""
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\""
......@@ -162,7 +161,7 @@ azure_debug:
echo "export ELASTIC_USER_NAME=\"$ELASTIC_USER_NAME\""
echo "export DEFAULT_DATA_PARTITION_ID_TENANT1=\"$DEFAULT_DATA_PARTITION_ID_TENANT1\""
echo "export DEFAULT_DATA_PARTITION_ID_TENANT2=\"$DEFAULT_DATA_PARTITION_ID_TENANT2\""
echo "export ENTITLEMENTS_DOMAIN=\"$ENTITLEMENTS_DOMAIN.com\""
echo "export ENTITLEMENTS_DOMAIN=\"$ENTITLEMENTS_DOMAIN\""
echo "export ENVIRONMENT=\"$ENVIRONMENT\""
echo "export LEGAL_TAG=\"$LEGAL_TAG\""
echo "export OTHER_RELEVANT_DATA_COUNTRIES=\"$OTHER_RELEVANT_DATA_COUNTRIES\""
......@@ -243,7 +242,7 @@ 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)
- TARGET=$(find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' | 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