From 2b6e5782255f357d7f51d73e48439a9086561723 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Mar 2021 14:39:38 -0800 Subject: [PATCH 1/8] resolve installation failure by swapping to aggregate-reports to linux --- eng/pipelines/aggregate-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml index b96c1c74d047..01f199c841b8 100644 --- a/eng/pipelines/aggregate-reports.yml +++ b/eng/pipelines/aggregate-reports.yml @@ -14,7 +14,7 @@ jobs: - template: ./templates/variables/globals.yml pool: - vmImage: 'windows-2019' + vmImage: 'ubuntu-1804' steps: - template: /eng/pipelines/templates/steps/analyze_dependency.yml From 7141fae67ffbb29a902addaacb6e9d3ba306af04 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Mar 2021 14:54:53 -0800 Subject: [PATCH 2/8] update pool --- eng/pipelines/aggregate-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml index 01f199c841b8..d2380981b3a8 100644 --- a/eng/pipelines/aggregate-reports.yml +++ b/eng/pipelines/aggregate-reports.yml @@ -14,7 +14,8 @@ jobs: - template: ./templates/variables/globals.yml pool: - vmImage: 'ubuntu-1804' + name: azsdk-pool-mms-ubuntu-1804-general + vmImage: MMSUbuntu18.04 steps: - template: /eng/pipelines/templates/steps/analyze_dependency.yml From f03590fdff89781edaecd31f38583077496c4f10 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Mar 2021 15:06:28 -0800 Subject: [PATCH 3/8] bump azure file copy task version so it's compatible with linux --- eng/pipelines/aggregate-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml index d2380981b3a8..cf967435a5eb 100644 --- a/eng/pipelines/aggregate-reports.yml +++ b/eng/pipelines/aggregate-reports.yml @@ -20,7 +20,7 @@ jobs: steps: - template: /eng/pipelines/templates/steps/analyze_dependency.yml - - task: AzureFileCopy@2 + - task: AzureFileCopy@4 displayName: 'Upload dependency report' condition: and(succeededOrFailed(), eq(variables['System.TeamProject'], 'internal')) inputs: From 30b5feaa401f1246e678b005800b9e5004eeb457 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Mar 2021 15:16:10 -0800 Subject: [PATCH 4/8] return azurefilecopy to the original version. reset pool to MMS2019 --- eng/pipelines/aggregate-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml index cf967435a5eb..76d13632c915 100644 --- a/eng/pipelines/aggregate-reports.yml +++ b/eng/pipelines/aggregate-reports.yml @@ -14,13 +14,13 @@ jobs: - template: ./templates/variables/globals.yml pool: - name: azsdk-pool-mms-ubuntu-1804-general - vmImage: MMSUbuntu18.04 + name: azsdk-pool-mms-win-2019-general + vmImage: MMS2019 steps: - template: /eng/pipelines/templates/steps/analyze_dependency.yml - - task: AzureFileCopy@4 + - task: AzureFileCopy@2 displayName: 'Upload dependency report' condition: and(succeededOrFailed(), eq(variables['System.TeamProject'], 'internal')) inputs: From 7d139cfb8a5ed3d628d5814e57fb67b884552456 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Mar 2021 15:31:26 -0800 Subject: [PATCH 5/8] get around pip install error windows --- eng/pipelines/templates/steps/analyze_dependency.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/steps/analyze_dependency.yml b/eng/pipelines/templates/steps/analyze_dependency.yml index 77ab69df6dd3..ab0efc047cba 100644 --- a/eng/pipelines/templates/steps/analyze_dependency.yml +++ b/eng/pipelines/templates/steps/analyze_dependency.yml @@ -4,8 +4,11 @@ steps: inputs: versionSpec: '$(PythonVersion)' - - script: | - pip install -r eng/ci_tools.txt + - pwsh: | + if($IsWindows){ + $prefix="sudo" + } + $prefix pip install -r eng/ci_tools.txt ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml displayName: 'Verify Readmes' From 3f1512c2132352cad8a4345ace0feb517630e052 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Mar 2021 15:36:05 -0800 Subject: [PATCH 6/8] try with just user --- eng/pipelines/templates/steps/analyze_dependency.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/pipelines/templates/steps/analyze_dependency.yml b/eng/pipelines/templates/steps/analyze_dependency.yml index ab0efc047cba..309aea5b5dc3 100644 --- a/eng/pipelines/templates/steps/analyze_dependency.yml +++ b/eng/pipelines/templates/steps/analyze_dependency.yml @@ -5,10 +5,7 @@ steps: versionSpec: '$(PythonVersion)' - pwsh: | - if($IsWindows){ - $prefix="sudo" - } - $prefix pip install -r eng/ci_tools.txt + pip install -r eng/ci_tools.txt --user ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml displayName: 'Verify Readmes' From 342626690eeaded92668dbd4b0a96d24af3dfb83 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Mar 2021 16:04:50 -0800 Subject: [PATCH 7/8] make --user only invoke on windows machines --- eng/pipelines/templates/steps/analyze_dependency.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/analyze_dependency.yml b/eng/pipelines/templates/steps/analyze_dependency.yml index 309aea5b5dc3..da5cfdc5abfd 100644 --- a/eng/pipelines/templates/steps/analyze_dependency.yml +++ b/eng/pipelines/templates/steps/analyze_dependency.yml @@ -5,7 +5,7 @@ steps: versionSpec: '$(PythonVersion)' - pwsh: | - pip install -r eng/ci_tools.txt --user + pip install -r eng/ci_tools.txt $(if($IsWindows) {"--user" })) ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml displayName: 'Verify Readmes' From ce02f6731fd46feae37f6737e86d16cf7a507730 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Mar 2021 16:11:17 -0800 Subject: [PATCH 8/8] correct minor issue --- eng/pipelines/templates/steps/analyze_dependency.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/analyze_dependency.yml b/eng/pipelines/templates/steps/analyze_dependency.yml index da5cfdc5abfd..a82760dd83d5 100644 --- a/eng/pipelines/templates/steps/analyze_dependency.yml +++ b/eng/pipelines/templates/steps/analyze_dependency.yml @@ -5,7 +5,7 @@ steps: versionSpec: '$(PythonVersion)' - pwsh: | - pip install -r eng/ci_tools.txt $(if($IsWindows) {"--user" })) + pip install -r eng/ci_tools.txt $(if($IsWindows) {"--user" }) ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml displayName: 'Verify Readmes'