From 30b26d147bc8bfb5043311da3b8fb4f18a6be85b Mon Sep 17 00:00:00 2001 From: Soham Dasgupta Date: Fri, 26 Jan 2024 15:41:53 -0800 Subject: [PATCH] add test branch --- .pipelines/azure-pipeline-build.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.pipelines/azure-pipeline-build.yml b/.pipelines/azure-pipeline-build.yml index ce9578f9c..7b2f15f7a 100644 --- a/.pipelines/azure-pipeline-build.yml +++ b/.pipelines/azure-pipeline-build.yml @@ -2,6 +2,7 @@ trigger: branches: include: - main + - addTelemetryCollectorTokenAdaptor pr: autoCancel: true @@ -54,7 +55,7 @@ jobs: #Truncating this to 124 to add the cfg suffix LINUX_IMAGE_TAG_PREFIX=$(echo "${LINUX_IMAGE_TAG}" | cut -c1-124) LINUX_CONFIG_READER_IMAGE_TAG=$LINUX_IMAGE_TAG_PREFIX-cfg - + #Truncating this to 113 to add the ref app suffices LINUX_REF_APP_IMAGE_TAG_PREFIX=$(echo "${LINUX_IMAGE_TAG}" | cut -c1-113) LINUX_REF_APP_GOLANG_IMAGE_TAG=$LINUX_REF_APP_IMAGE_TAG_PREFIX-ref-app-golang @@ -241,7 +242,7 @@ jobs: docker push $(WINDOWS_REF_APP_PYTHON_FULL_IMAGE_NAME) displayName: "Build: build and push reference app python windows image to dev ACR" workingDirectory: $(Build.SourcesDirectory)/internal/referenceapp/python - + - job: SDL_Policheck_Scan displayName: "SDL: policheck scanning" pool: @@ -952,7 +953,7 @@ jobs: else echo "-e error failed to login to az with managed identity credentials" exit 1 - fi + fi ACCESS_TOKEN=$(az account get-access-token --resource $RESOURCE_AUDIENCE --query accessToken -o json) if [ $? -eq 0 ]; then @@ -960,7 +961,7 @@ jobs: else echo "-e error get access token from resource:$RESOURCE_AUDIENCE failed." exit 1 - fi + fi ACCESS_TOKEN=$(echo $ACCESS_TOKEN | tr -d '"' | tr -d '"\r\n') ARC_API_URL="https://eastus2euap.dp.kubernetesconfiguration.azure.com" @@ -982,7 +983,7 @@ jobs: inputs: azureSubscription: 'ContainerInsights_Build_Subscription(9b96ebbd-c57a-42d1-bbe9-b69296e4c7fb)' scriptType: 'bash' - scriptLocation: 'inlineScript' + scriptLocation: 'inlineScript' inlineScript: | for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do @@ -1004,7 +1005,7 @@ jobs: inputs: azureSubscription: 'ContainerInsights_Build_Subscription(9b96ebbd-c57a-42d1-bbe9-b69296e4c7fb)' scriptType: 'bash' - scriptLocation: 'inlineScript' + scriptLocation: 'inlineScript' inlineScript: | az config set extension.use_dynamic_install=yes_without_prompt az k8s-extension update --name azuremonitor-metrics --resource-group ci-dev-arc-wcus --cluster-name ci-dev-arc-wcus --cluster-type connectedClusters --version $HELM_SEMVER --release-train pipeline