Skip to content

Commit b0631e2

Browse files
authored
Patch remaining release stages that are affected by CfsClean (#46201)
* patch remaining items that may crash during a release
1 parent dfda24e commit b0631e2

4 files changed

Lines changed: 73 additions & 27 deletions

File tree

eng/pipelines/templates/jobs/smoke.tests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ parameters:
77
- name: ArtifactName
88
type: string
99
default: "not-specified"
10+
- name: DevFeedName
11+
type: string
12+
default: 'public/azure-sdk-for-python'
1013

1114
jobs:
1215
- ${{ if eq(parameters.Daily, false) }}:
@@ -67,6 +70,7 @@ jobs:
6770
Artifact: ${{ parameters.Artifact }}
6871
ArtifactName: ${{ parameters.ArtifactName }}
6972
Daily: ${{ parameters.Daily }}
73+
DevFeedName: ${{ parameters.DevFeedName }}
7074

7175
- ${{ if eq(parameters.Daily, true) }}:
7276
- job: run_smoke_test_windows
@@ -99,6 +103,7 @@ jobs:
99103
Artifact: ${{ parameters.Artifact }}
100104
ArtifactName: ${{ parameters.ArtifactName }}
101105
Daily: ${{ parameters.Daily }}
106+
DevFeedName: ${{ parameters.DevFeedName }}
102107

103108
- job: run_smoke_test_macos
104109
displayName: Run Smoke Test MacOS
@@ -131,4 +136,5 @@ jobs:
131136
parameters:
132137
Artifact: ${{ parameters.Artifact }}
133138
ArtifactName: ${{ parameters.ArtifactName }}
134-
Daily: ${{ parameters.Daily }}
139+
Daily: ${{ parameters.Daily }}
140+
DevFeedName: ${{ parameters.DevFeedName }}

eng/pipelines/templates/stages/archetype-python-release.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ stages:
4242
inputs:
4343
versionSpec: '3.12'
4444

45+
- template: /eng/pipelines/templates/steps/auth-dev-feed.yml
46+
parameters:
47+
DevFeedName: ${{ parameters.DevFeedName }}
48+
4549
- template: /eng/common/pipelines/templates/steps/retain-run.yml
4650

4751
- template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
@@ -125,6 +129,13 @@ stages:
125129
inputs:
126130
versionSpec: '3.9'
127131

132+
- template: /eng/pipelines/templates/steps/auth-dev-feed.yml
133+
parameters:
134+
DevFeedName: ${{ parameters.DevFeedName }}
135+
EnableTwineAuth: false
136+
EnablePipAuth: true
137+
EnableUvAuth: false
138+
128139
- script: |
129140
python -m pip install -r $(Pipeline.Workspace)/release_artifact/release_requirements.txt
130141
displayName: Install Release Dependencies
@@ -280,6 +291,10 @@ stages:
280291
inputs:
281292
versionSpec: '3.12.x'
282293

294+
- template: /eng/pipelines/templates/steps/auth-dev-feed.yml
295+
parameters:
296+
DevFeedName: ${{ parameters.DevFeedName }}
297+
283298
- template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml
284299

285300
- template: /eng/common/pipelines/templates/steps/update-docsms-metadata.yml
@@ -307,6 +322,11 @@ stages:
307322
steps:
308323
- checkout: self
309324
- task: UsePythonVersion@0
325+
326+
- template: /eng/pipelines/templates/steps/auth-dev-feed.yml
327+
parameters:
328+
DevFeedName: ${{ parameters.DevFeedName }}
329+
310330
- script: |
311331
python -m pip install "./eng/tools/azure-sdk-tools"
312332
displayName: Install versioning tool dependencies
@@ -333,6 +353,7 @@ stages:
333353
Daily: false
334354
ArtifactName: ${{ parameters.ArtifactName }}
335355
Artifact: ${{ artifact }}
356+
DevFeedName: ${{ parameters.DevFeedName }}
336357

337358
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
338359
- stage: Integration
@@ -350,15 +371,17 @@ stages:
350371
- download: current
351372
artifact: ${{parameters.ArtifactName}}
352373
timeoutInMinutes: 5
374+
353375
- task: UsePythonVersion@0
354-
- script: |
355-
set -e
356-
python -m pip install twine
357-
displayName: Install Twine
358376

359377
- template: ../steps/auth-dev-feed.yml
360378
parameters:
361379
DevFeedName: ${{ parameters.DevFeedName }}
380+
381+
- script: |
382+
set -e
383+
python -m pip install twine
384+
displayName: Install Twine
362385
363386
- ${{ each artifact in parameters.Artifacts }}:
364387
- ${{if ne(artifact.skipPublishDevFeed, 'true')}}:
@@ -412,6 +435,10 @@ stages:
412435
inputs:
413436
versionSpec: '3.11'
414437

438+
- template: /eng/pipelines/templates/steps/auth-dev-feed.yml
439+
parameters:
440+
DevFeedName: ${{ parameters.DevFeedName }}
441+
415442
- template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml
416443

417444
- template: /eng/common/pipelines/templates/steps/update-docsms-metadata.yml
Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
parameters:
22
DevFeedName: 'public/azure-sdk-for-python'
3+
EnableTwineAuth: true
4+
EnablePipAuth: true
5+
EnableUvAuth: true
36

47
steps:
58
- pwsh: |
@@ -14,27 +17,30 @@ steps:
1417
echo "Using DevopsFeed = $devopsFeedName"
1518
displayName: Setup DevOpsFeedName
1619
17-
- task: TwineAuthenticate@0
18-
displayName: 'Twine Authenticate to feed'
19-
inputs:
20-
artifactFeeds: $(DevFeedName)
20+
- ${{ if eq(parameters.EnableTwineAuth, true) }}:
21+
- task: TwineAuthenticate@0
22+
displayName: 'Twine Authenticate to feed'
23+
inputs:
24+
artifactFeeds: $(DevFeedName)
2125

22-
- task: PipAuthenticate@1
23-
displayName: 'Pip Authenticate to feed'
24-
inputs:
25-
artifactFeeds: $(DevFeedName)
26-
onlyAddExtraIndex: false
26+
- ${{ if eq(parameters.EnablePipAuth, true) }}:
27+
- task: PipAuthenticate@1
28+
displayName: 'Pip Authenticate to feed'
29+
inputs:
30+
artifactFeeds: $(DevFeedName)
31+
onlyAddExtraIndex: false
2732

28-
- pwsh: |
29-
if ($env:PIP_INDEX_URL) {
30-
Write-Host "Found pip index URL: $($env:PIP_INDEX_URL)"
31-
# UV_DEFAULT_INDEX is the canonical replacement for the deprecated UV_INDEX_URL (uv 0.4.23+).
32-
# PIP_INDEX_URL is set by PipAuthenticate@1 and contains embedded credentials, which uv
33-
# will use for Basic auth against the ADO feed (and its PyPI upstream) per astral-sh/uv#12651.
34-
Write-Host "##vso[task.setvariable variable=UV_DEFAULT_INDEX]$($env:PIP_INDEX_URL)"
35-
# Disable keyring so uv uses the URL-embedded credentials directly.
36-
Write-Host "##vso[task.setvariable variable=UV_KEYRING_PROVIDER]disabled"
37-
} else {
38-
Write-Host "##[warning]PIP_INDEX_URL not set - uv will fall back to public PyPI."
39-
}
40-
displayName: 'Configure UV Authentication'
33+
- ${{ if eq(parameters.EnableUvAuth, true) }}:
34+
- pwsh: |
35+
if ($env:PIP_INDEX_URL) {
36+
Write-Host "Found pip index URL: $($env:PIP_INDEX_URL)"
37+
# UV_DEFAULT_INDEX is the canonical replacement for the deprecated UV_INDEX_URL (uv 0.4.23+).
38+
# PIP_INDEX_URL is set by PipAuthenticate@1 and contains embedded credentials, which uv
39+
# will use for Basic auth against the ADO feed (and its PyPI upstream) per astral-sh/uv#12651.
40+
Write-Host "##vso[task.setvariable variable=UV_DEFAULT_INDEX]$($env:PIP_INDEX_URL)"
41+
# Disable keyring so uv uses the URL-embedded credentials directly.
42+
Write-Host "##vso[task.setvariable variable=UV_KEYRING_PROVIDER]disabled"
43+
} else {
44+
Write-Host "##[warning]PIP_INDEX_URL not set - uv will fall back to public PyPI."
45+
}
46+
displayName: 'Configure UV Authentication'

eng/pipelines/templates/steps/smoke-test-steps.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@ parameters:
77
- name: ArtifactName
88
type: string
99
default: "not-specified"
10+
- name: DevFeedName
11+
type: string
12+
default: 'public/azure-sdk-for-python'
1013

1114
steps:
1215
- task: UsePythonVersion@0
1316
displayName: "Use Python $(PythonVersion)"
1417
inputs:
1518
versionSpec: $(PythonVersion)
1619

20+
- template: /eng/pipelines/templates/steps/auth-dev-feed.yml
21+
parameters:
22+
DevFeedName: ${{ parameters.DevFeedName }}
23+
1724
- script: |
1825
python -m pip install pip==20.0.2
1926
pip --version

0 commit comments

Comments
 (0)