From cf2bb52b611bd07abb5917d9b744de67c2083601 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Wed, 8 Jul 2026 14:32:04 -0700 Subject: [PATCH 01/13] Remove release category for PMC --- .pipelines/DSC-Official-PMC.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 461b5e7dd..6cd432066 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -32,8 +32,6 @@ resources: extends: template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates parameters: - release: - category: Azure featureFlags: WindowsHostVersion: Disk: Large From 18cf65fb96d31f0ef063e681cfcb3133eff8487d Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Wed, 8 Jul 2026 15:45:54 -0700 Subject: [PATCH 02/13] change setpackageversion stage to use linux --- .pipelines/DSC-Official-PMC.yml | 3 +-- .pipelines/DSC-Official.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 6cd432066..4730861ef 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -65,8 +65,7 @@ extends: - job: SetPackageVersion displayName: Set PackageVersion pool: - type: windows - vmImage: windows-latest + type: linux variables: ob_outputDirectory: '$(Build.ArtifactStagingDirectory)' ob_sdl_sbom_enabled: false diff --git a/.pipelines/DSC-Official.yml b/.pipelines/DSC-Official.yml index 139b798fb..d803355cd 100644 --- a/.pipelines/DSC-Official.yml +++ b/.pipelines/DSC-Official.yml @@ -81,8 +81,7 @@ extends: - job: SetPackageVersion displayName: Set PackageVersion pool: - type: windows - vmImage: windows-latest + type: linux variables: ob_outputDirectory: '$(Build.ArtifactStagingDirectory)' ob_sdl_sbom_enabled: false From e8788132f2d0d6b7f8312324e375aa301d2f066a Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Wed, 8 Jul 2026 16:40:55 -0700 Subject: [PATCH 03/13] set image name --- .pipelines/DSC-Official-PMC.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 4730861ef..6266e5964 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -32,11 +32,6 @@ resources: extends: template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates parameters: - featureFlags: - WindowsHostVersion: - Disk: Large - Version: 2022 - Network: KS1 customTags: 'ES365AIMigrationTooling' globalSdl: disableLegacyManifest: true @@ -67,6 +62,7 @@ extends: pool: type: linux variables: + LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest' ob_outputDirectory: '$(Build.ArtifactStagingDirectory)' ob_sdl_sbom_enabled: false ob_signing_setup_enabled: false From 25d6b64c96952429f62762b28a662326ce837107 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Wed, 8 Jul 2026 18:58:47 -0700 Subject: [PATCH 04/13] specify image for prep stage --- .pipelines/DSC-Official-PMC.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 6266e5964..f2b840299 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -179,6 +179,8 @@ extends: - input: pipelineArtifact artifactName: drop_BuildAndSign_BuildLinuxArm64Musl variables: + - name: LinuxContainerImage + value: 'onebranch.azurecr.io/linux/ubuntu-2204:latest' - name: ob_outputDirectory value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT' - name: ev2ServiceGroupRootFolder @@ -326,6 +328,7 @@ extends: SourceFolder: '$(Build.SourcesDirectory)/.pipelines' Contents: 'EV2Specs/**' TargetFolder: $(ob_outputDirectory) + - stage: Prod_PMCRelease displayName: 'Deploy packages to PMC with EV2' dependsOn: From c8a6f99214b9c08ca503f97e3ed19360c794295e Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Thu, 9 Jul 2026 08:45:02 -0700 Subject: [PATCH 05/13] fix feed to msazure --- .pipelines/DSC-Official-PMC.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index f2b840299..7302b59f0 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -206,7 +206,7 @@ extends: - task: PipAuthenticate@1 inputs: - artifactFeeds: 'PowerShellCore/PowerShellCore_PublicPackages' + artifactFeeds: 'Compute-PMC@Release' displayName: 'Pip Authenticate' env: ob_restore_phase: true From cf17086347fbc69908f7b4475e07d9ebb30a70c7 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Thu, 9 Jul 2026 08:46:32 -0700 Subject: [PATCH 06/13] fix feed name --- .pipelines/DSC-Official-PMC.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 7302b59f0..923b9bfc5 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -206,7 +206,7 @@ extends: - task: PipAuthenticate@1 inputs: - artifactFeeds: 'Compute-PMC@Release' + artifactFeeds: 'DSC-Compute-PMC' displayName: 'Pip Authenticate' env: ob_restore_phase: true From 1c36b8ccce10c5a27559c69dce3e8c8b41d69973 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Thu, 9 Jul 2026 12:35:22 -0700 Subject: [PATCH 07/13] fix feed name --- .pipelines/DSC-Official-PMC.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 923b9bfc5..b751f3510 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -206,7 +206,7 @@ extends: - task: PipAuthenticate@1 inputs: - artifactFeeds: 'DSC-Compute-PMC' + artifactFeeds: 'One/DSC-Compute-PMC' displayName: 'Pip Authenticate' env: ob_restore_phase: true From da0a2bc7b09957f01e89eb16244df05e8d58cc96 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Thu, 9 Jul 2026 15:57:00 -0700 Subject: [PATCH 08/13] change to use different feed --- .pipelines/DSC-Official-PMC.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index b751f3510..39f730659 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -206,7 +206,7 @@ extends: - task: PipAuthenticate@1 inputs: - artifactFeeds: 'One/DSC-Compute-PMC' + artifactFeeds: 'One/Compute-PMC@Release' displayName: 'Pip Authenticate' env: ob_restore_phase: true From 6e553c6b6f1adff6fc374ea8f4b60c59d58e0bdc Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Thu, 9 Jul 2026 17:33:12 -0700 Subject: [PATCH 09/13] remove platform filter --- .pipelines/DSC-Official-PMC.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 39f730659..1670ac427 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -206,7 +206,7 @@ extends: - task: PipAuthenticate@1 inputs: - artifactFeeds: 'One/Compute-PMC@Release' + artifactFeeds: 'One/DSC-Compute-PMC' displayName: 'Pip Authenticate' env: ob_restore_phase: true @@ -216,7 +216,7 @@ extends: pip --version --verbose $pythonDlFolderPath = Join-Path '$(ev2ServiceGroupRootFolder)/Shell/Run' -ChildPath "python_dl" New-Item -Path $pythonDlFolderPath -ItemType Directory -Force > $null - pip download -d $pythonDlFolderPath pmc-cli --platform=manylinux_2_17_x86_64 --only-binary=:all: --verbose + pip download -d $pythonDlFolderPath pmc-cli --only-binary=:all: --verbose displayName: 'Download pmc-cli package' env: ob_restore_phase: true From 5d4cafbbb8467d97b052895c337474e6c2279be7 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Fri, 10 Jul 2026 14:31:31 -0700 Subject: [PATCH 10/13] enable verbose output from pip --- .pipelines/DSC-Official-PMC.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 1670ac427..54c78fd6f 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -216,7 +216,7 @@ extends: pip --version --verbose $pythonDlFolderPath = Join-Path '$(ev2ServiceGroupRootFolder)/Shell/Run' -ChildPath "python_dl" New-Item -Path $pythonDlFolderPath -ItemType Directory -Force > $null - pip download -d $pythonDlFolderPath pmc-cli --only-binary=:all: --verbose + pip download -d $pythonDlFolderPath pmc-cli --only-binary=:all: -vvv displayName: 'Download pmc-cli package' env: ob_restore_phase: true From 53691314bfa6909dc64e2d09e6047b349010da79 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Fri, 10 Jul 2026 14:47:16 -0700 Subject: [PATCH 11/13] try different feed --- .pipelines/DSC-Official-PMC.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 54c78fd6f..657fd2861 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -206,7 +206,8 @@ extends: - task: PipAuthenticate@1 inputs: - artifactFeeds: 'One/DSC-Compute-PMC' +# artifactFeeds: 'One/DSC-Compute-PMC' + artifactFeeds: 'One/azsecpack-pmc-cli' displayName: 'Pip Authenticate' env: ob_restore_phase: true From cff045692b01f7d7bdb7f4e3fc081ab3ff9b1af5 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Fri, 10 Jul 2026 16:20:43 -0700 Subject: [PATCH 12/13] fix comparison in script --- .pipelines/DSC-Official-PMC.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index 657fd2861..da6d869be 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -206,7 +206,7 @@ extends: - task: PipAuthenticate@1 inputs: -# artifactFeeds: 'One/DSC-Compute-PMC' + # artifactFeeds: 'One/DSC-Compute-PMC' artifactFeeds: 'One/azsecpack-pmc-cli' displayName: 'Pip Authenticate' env: @@ -248,7 +248,7 @@ extends: $metadataHash = @{ ReleaseTag = "v$packageVersion" ForProduction = $true - SkipPublish = $(PublishToPMC) -eq 'false' + SkipPublish = '$(PublishToPMC)'' -eq 'False' } $metadataHash | ConvertTo-Json | Out-File $pathToPMCMetadataFile From 7e7134c05d47843b487d13c8bc41c22a9e0b271a Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Fri, 10 Jul 2026 16:25:05 -0700 Subject: [PATCH 13/13] fix typo --- .pipelines/DSC-Official-PMC.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/DSC-Official-PMC.yml b/.pipelines/DSC-Official-PMC.yml index da6d869be..3b3ab4e7a 100644 --- a/.pipelines/DSC-Official-PMC.yml +++ b/.pipelines/DSC-Official-PMC.yml @@ -248,7 +248,7 @@ extends: $metadataHash = @{ ReleaseTag = "v$packageVersion" ForProduction = $true - SkipPublish = '$(PublishToPMC)'' -eq 'False' + SkipPublish = '$(PublishToPMC)' -eq 'False' } $metadataHash | ConvertTo-Json | Out-File $pathToPMCMetadataFile