Commit 091105ce authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Merge branch 'trusted-azure' into 'master'

Trusted Azure Updates

See merge request osdu/platform/ci-cd-pipelines!15
parents c1fa071c 03a3d3ba
......@@ -124,7 +124,7 @@ azure_debug:
echo "export HOST_URL=\"$HOST_URL\""
echo "export ENTITLEMENT_URL=\"$ENTITLEMENT_URL\""
echo "export LEGAL_URL=\"$LEGAL_URL\""
echo "export STORAGE_URL=\"$STORAGE_URL\""
echo "export STORAGE_URL=\"$STORAGE_URL\""s
echo "export SEARCH_URL=\"$SEARCH_URL\""
echo "export INDEXER_URL=\"$INDEXER_URL\""
echo "export INTEGRATION_TESTER=\"\$AZURE_PRINCIPAL_ID\""
......@@ -250,8 +250,12 @@ azure_config:
before_script:
- az login --service-principal -u $AZURE_PRINCIPAL_ID -p $AZURE_PRINCIPAL_SECRET --tenant $AZURE_TENANT_ID
script:
- find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' | sort -rz
- TARGET=$(find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' | sort -rz | head -n 1)
- |
if [ "$AZURE_SERVICE" == "entitlements" ]; then
TARGET=$(find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' |head -n 1)
else
TARGET=$(find ./$AZURE_BUILD_SUBDIR/target -name '*-spring-boot.jar' |head -n 1)
fi
- 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