From d4990aa945340e7dbf101c7eb74ba564c26c28bb Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Tue, 15 Mar 2022 15:33:28 +0000 Subject: [PATCH 1/2] add missing artifacts --- .pipelines/azure_pipeline_dev.yaml | 3 +++ .pipelines/azure_pipeline_prod.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.pipelines/azure_pipeline_dev.yaml b/.pipelines/azure_pipeline_dev.yaml index 6d50e5788..ed67742d4 100644 --- a/.pipelines/azure_pipeline_dev.yaml +++ b/.pipelines/azure_pipeline_dev.yaml @@ -26,6 +26,9 @@ steps: cd deployment/multiarch-agent-deployment/ServiceGroupRoot/Scripts tar -czvf ../artifacts.tar.gz pushAgentToAcr.sh + cd deployment/arc-k8s-extension/ServiceGroupRoot/Scripts + tar -czvf ../artifacts.tar.gz ../../../../charts/azuremonitor-containers/ pushChartToAcr.sh + - task: CopyFiles@2 displayName: "Copy ev2 deployment artifacts" inputs: diff --git a/.pipelines/azure_pipeline_prod.yaml b/.pipelines/azure_pipeline_prod.yaml index 046d41910..d2256dac2 100644 --- a/.pipelines/azure_pipeline_prod.yaml +++ b/.pipelines/azure_pipeline_prod.yaml @@ -26,6 +26,9 @@ steps: cd deployment/multiarch-agent-deployment/ServiceGroupRoot/Scripts tar -czvf ../artifacts.tar.gz pushAgentToAcr.sh + cd deployment/arc-k8s-extension/ServiceGroupRoot/Scripts + tar -czvf ../artifacts.tar.gz ../../../../charts/azuremonitor-containers/ pushChartToAcr.sh + - task: CopyFiles@2 displayName: "Copy ev2 deployment artifacts" inputs: From bad0b42f11bf94b55295acc310a2e7c87920254e Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Tue, 15 Mar 2022 15:55:38 +0000 Subject: [PATCH 2/2] fix incorrect paths --- .pipelines/azure_pipeline_dev.yaml | 4 ++-- .pipelines/azure_pipeline_prod.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pipelines/azure_pipeline_dev.yaml b/.pipelines/azure_pipeline_dev.yaml index ed67742d4..311d87400 100644 --- a/.pipelines/azure_pipeline_dev.yaml +++ b/.pipelines/azure_pipeline_dev.yaml @@ -23,10 +23,10 @@ steps: datetime=$(date +'%Y%m%d%s') echo "##vso[task.setvariable variable=datetime;]$datetime" - cd deployment/multiarch-agent-deployment/ServiceGroupRoot/Scripts + cd $(Build.SourcesDirectory)/deployment/multiarch-agent-deployment/ServiceGroupRoot/Scripts tar -czvf ../artifacts.tar.gz pushAgentToAcr.sh - cd deployment/arc-k8s-extension/ServiceGroupRoot/Scripts + cd $(Build.SourcesDirectory)/deployment/arc-k8s-extension/ServiceGroupRoot/Scripts tar -czvf ../artifacts.tar.gz ../../../../charts/azuremonitor-containers/ pushChartToAcr.sh - task: CopyFiles@2 diff --git a/.pipelines/azure_pipeline_prod.yaml b/.pipelines/azure_pipeline_prod.yaml index d2256dac2..7608af28f 100644 --- a/.pipelines/azure_pipeline_prod.yaml +++ b/.pipelines/azure_pipeline_prod.yaml @@ -23,10 +23,10 @@ steps: datetime=$(date +'%Y%m%d%s') echo "##vso[task.setvariable variable=datetime;]$datetime" - cd deployment/multiarch-agent-deployment/ServiceGroupRoot/Scripts + cd $(Build.SourcesDirectory)/deployment/multiarch-agent-deployment/ServiceGroupRoot/Scripts tar -czvf ../artifacts.tar.gz pushAgentToAcr.sh - cd deployment/arc-k8s-extension/ServiceGroupRoot/Scripts + cd $(Build.SourcesDirectory)/deployment/arc-k8s-extension/ServiceGroupRoot/Scripts tar -czvf ../artifacts.tar.gz ../../../../charts/azuremonitor-containers/ pushChartToAcr.sh - task: CopyFiles@2