From b63fc96ccfb292568eb370c673c5af41330e6e42 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 19 Mar 2024 13:21:31 -0700 Subject: [PATCH 1/3] fix the npm release tag --- eng/pipelines/npm-tasks.yml | 58 +++++++++++-------- .../templates/stages/1es-redirect.yml | 46 +++++++++++++++ 2 files changed, 80 insertions(+), 24 deletions(-) create mode 100644 eng/pipelines/templates/stages/1es-redirect.yml diff --git a/eng/pipelines/npm-tasks.yml b/eng/pipelines/npm-tasks.yml index 5b541806b3e0..e803bbcff5f1 100644 --- a/eng/pipelines/npm-tasks.yml +++ b/eng/pipelines/npm-tasks.yml @@ -45,29 +45,39 @@ parameters: type: string default: '' -jobs: -- deployment: 'NPM_Admin' - displayName: NPM package management - environment: npm - pool: - vmImage: 'windows-2022' +extends: + template: /eng/pipelines/templates/stages/1es-redirect.yml + parameters: + stages: + - stage: + displayName: NPM Tag - strategy: - runOnce: - deploy: - steps: - - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml - - task: PowerShell@2 - displayName: 'Run Task' - inputs: - targetType: filePath - filePath: "eng/scripts/npm-admin-tasks.ps1" - arguments: > - -taskType ${{parameters.TaskType}} - -packageName ${{parameters.PackageName}} - -pkgVersion ${{parameters.PkgVersion}} - -tagName ${{parameters.TagName}} - -npmToken "$(azure-sdk-npm-token)" - -reason "${{parameters.Reason}}" - pwsh: true + jobs: + - deployment: 'NPM_Admin' + displayName: NPM package management + environment: npm + + pool: + name: azsdk-pool-mms-win-2022-general + image: azsdk-pool-mms-win-2022-1espt + os: windows + + strategy: + runOnce: + deploy: + steps: + - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml + - task: PowerShell@2 + displayName: 'Run Task' + inputs: + targetType: filePath + filePath: "eng/scripts/npm-admin-tasks.ps1" + arguments: > + -taskType ${{parameters.TaskType}} + -packageName ${{parameters.PackageName}} + -pkgVersion ${{parameters.PkgVersion}} + -tagName ${{parameters.TagName}} + -npmToken "$(azure-sdk-npm-token)" + -reason "${{parameters.Reason}}" + pwsh: true diff --git a/eng/pipelines/templates/stages/1es-redirect.yml b/eng/pipelines/templates/stages/1es-redirect.yml new file mode 100644 index 000000000000..162167dbf893 --- /dev/null +++ b/eng/pipelines/templates/stages/1es-redirect.yml @@ -0,0 +1,46 @@ +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + - repository: azure-sdk-build-tools + type: git + name: internal/azure-sdk-build-tools + ref: refs/tags/azure-sdk-build-tools_20230829.1 + +parameters: +- name: stages + type: stageList + default: [] +- name: Use1ESOfficial + type: boolean + default: true + +extends: + ${{ if and(parameters.Use1ESOfficial, eq(variables['System.TeamProject'], 'internal')) }}: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + settings: + skipBuildTagsForGitHubPullRequests: true + sdl: + sourceAnalysisPool: + name: azsdk-pool-mms-win-2022-general + image: azsdk-pool-mms-win-2022-1espt + os: windows + sourceRepositoriesToScan: + exclude: + - repository: azure-sdk-build-tools + credscan: + suppressionsFile: '$(Build.SourcesDirectory)/eng/CredScanSuppression.json' + toolVersion: '2.3.12.23' + eslint: + enabled: false + justificationForDisabling: "ESLint injected task has failures because it uses an old version of mkdirp. We should not fail for tools not controlled by the repo. See: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=3556850" + psscriptanalyzer: + compiled: true + break: true + policy: M365 + stages: ${{ parameters.stages }} From 340558f710e211947ccf94d5fb29c0f093030354 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 19 Mar 2024 13:24:48 -0700 Subject: [PATCH 2/3] stages must be indented --- eng/pipelines/npm-tasks.yml | 58 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/pipelines/npm-tasks.yml b/eng/pipelines/npm-tasks.yml index e803bbcff5f1..3df269e117b0 100644 --- a/eng/pipelines/npm-tasks.yml +++ b/eng/pipelines/npm-tasks.yml @@ -49,35 +49,35 @@ parameters: extends: template: /eng/pipelines/templates/stages/1es-redirect.yml parameters: - stages: - - stage: - displayName: NPM Tag + stages: + - stage: + displayName: NPM Tag - jobs: - - deployment: 'NPM_Admin' - displayName: NPM package management - environment: npm + jobs: + - deployment: 'NPM_Admin' + displayName: NPM package management + environment: npm - pool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt - os: windows + pool: + name: azsdk-pool-mms-win-2022-general + image: azsdk-pool-mms-win-2022-1espt + os: windows - strategy: - runOnce: - deploy: - steps: - - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml - - task: PowerShell@2 - displayName: 'Run Task' - inputs: - targetType: filePath - filePath: "eng/scripts/npm-admin-tasks.ps1" - arguments: > - -taskType ${{parameters.TaskType}} - -packageName ${{parameters.PackageName}} - -pkgVersion ${{parameters.PkgVersion}} - -tagName ${{parameters.TagName}} - -npmToken "$(azure-sdk-npm-token)" - -reason "${{parameters.Reason}}" - pwsh: true + strategy: + runOnce: + deploy: + steps: + - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml + - task: PowerShell@2 + displayName: 'Run Task' + inputs: + targetType: filePath + filePath: "eng/scripts/npm-admin-tasks.ps1" + arguments: > + -taskType ${{parameters.TaskType}} + -packageName ${{parameters.PackageName}} + -pkgVersion ${{parameters.PkgVersion}} + -tagName ${{parameters.TagName}} + -npmToken "$(azure-sdk-npm-token)" + -reason "${{parameters.Reason}}" + pwsh: true From 8f2eea4e15d1f2fe4613137e1a5690426a20186c Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 19 Mar 2024 13:30:33 -0700 Subject: [PATCH 3/3] update naming --- eng/pipelines/npm-tasks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/npm-tasks.yml b/eng/pipelines/npm-tasks.yml index 3df269e117b0..06a5b6e55158 100644 --- a/eng/pipelines/npm-tasks.yml +++ b/eng/pipelines/npm-tasks.yml @@ -51,7 +51,7 @@ extends: parameters: stages: - stage: - displayName: NPM Tag + displayName: NPM Task Execute jobs: - deployment: 'NPM_Admin'