From 6cc89b8038b1b462530978e16f72276270146112 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Thu, 8 Aug 2024 22:57:47 +0000 Subject: [PATCH 1/3] Download rsync if using mariner --- eng/pipelines/templates/jobs/vmr-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 7affd71f59d6..250b324581aa 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -479,6 +479,12 @@ jobs: targetFolder=$(Build.StagingDirectory)/BuildLogs/ mkdir -p ${targetFolder} + # Download rsync if using mariner + if grep -q "CBL-Mariner" /etc/os-release; then + tdnf install -y rsync + tdnf clean all + fi + cd "$(sourcesPath)" find artifacts/log/ -exec rsync -R {} -t ${targetFolder} \; if [ -d "artifacts/scenario-tests/" ]; then From 77880bc34080331653e036935797ba5c54a4eeeb Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Fri, 9 Aug 2024 18:53:48 +0000 Subject: [PATCH 2/3] Use sudo --- eng/pipelines/templates/jobs/vmr-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 250b324581aa..1733ebd8b494 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -481,8 +481,8 @@ jobs: # Download rsync if using mariner if grep -q "CBL-Mariner" /etc/os-release; then - tdnf install -y rsync - tdnf clean all + sudo tdnf install -y rsync + sudo tdnf clean all fi cd "$(sourcesPath)" From f0bc40a06da1e274efa276836b6dafbc292634af Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 12 Aug 2024 09:00:53 -0700 Subject: [PATCH 3/3] Update eng/pipelines/templates/jobs/vmr-build.yml Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com> --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 1733ebd8b494..4490d6ba8c95 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -480,7 +480,7 @@ jobs: mkdir -p ${targetFolder} # Download rsync if using mariner - if grep -q "CBL-Mariner" /etc/os-release; then + if grep -qE "CBL-Mariner|Azure Linux" /etc/os-release; then sudo tdnf install -y rsync sudo tdnf clean all fi