From 03d505c712335f99cb58b8a93930fd19df4d5545 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Fri, 31 Jul 2026 07:11:46 -0500 Subject: [PATCH 1/5] build: migrate to CFS pt2 --- eng/ci/official-build.yml | 2 +- eng/ci/public-build.yml | 2 +- eng/templates/jobs/build.yml | 8 ++++---- eng/templates/jobs/ci-tests.yml | 8 ++++---- eng/templates/official/jobs/build-artifacts.yml | 8 ++++---- eng/templates/official/release/build-artifacts.yml | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml index 8a6dcacd..4f499ff7 100644 --- a/eng/ci/official-build.yml +++ b/eng/ci/official-build.yml @@ -49,4 +49,4 @@ extends: jobs: - template: /eng/templates/jobs/ci-tests.yml@self parameters: - artifactFeed: 'internal/PythonSDK_Internal_PublicPackages' + artifactFeed: 'internal/upstream' diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml index 6805c560..0352b03a 100644 --- a/eng/ci/public-build.yml +++ b/eng/ci/public-build.yml @@ -49,4 +49,4 @@ extends: jobs: - template: /eng/templates/jobs/ci-tests.yml@self parameters: - artifactFeed: 'public/PythonSDK_PublicPackages' + artifactFeed: 'public/upstream-public' diff --git a/eng/templates/jobs/build.yml b/eng/templates/jobs/build.yml index 9a43ea4a..e9672984 100644 --- a/eng/templates/jobs/build.yml +++ b/eng/templates/jobs/build.yml @@ -16,16 +16,16 @@ jobs: PYTHON_VERSION: '3.14' steps: + - task: PipAuthenticate@1 + displayName: 'Pip Authenticate' + inputs: + artifactFeeds: 'public/upstream-public' - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) - bash: | python --version displayName: 'Check python version' - - task: PipAuthenticate@1 - displayName: 'Pip Authenticate' - inputs: - artifactFeeds: 'public/PythonSDK_PublicPackages' - bash: | python -m pip install -U pip python -m pip install build diff --git a/eng/templates/jobs/ci-tests.yml b/eng/templates/jobs/ci-tests.yml index c312c005..25cb040f 100644 --- a/eng/templates/jobs/ci-tests.yml +++ b/eng/templates/jobs/ci-tests.yml @@ -20,6 +20,10 @@ jobs: PYTHON_VERSION: '3.14' steps: + - task: PipAuthenticate@1 + displayName: 'Pip Authenticate' + inputs: + artifactFeeds: ${{ parameters.artifactFeed }} - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) @@ -27,10 +31,6 @@ jobs: VERSION=$(python -c "import re; content = open('azure/functions/__init__.py').read(); match = re.search(r\"__version__ = '(\d+)\.(\d+)\.(\d+).*'\", content); print(match.group(1)) if match else '1'") echo "##vso[task.setvariable variable=MAJOR_VERSION]$VERSION" displayName: 'Detect package version' - - task: PipAuthenticate@1 - displayName: 'Pip Authenticate' - inputs: - artifactFeeds: ${{ parameters.artifactFeed }} - bash: | PYTHON_MAJOR=$(echo $(PYTHON_VERSION) | cut -d. -f1) PYTHON_MINOR=$(echo $(PYTHON_VERSION) | cut -d. -f2) diff --git a/eng/templates/official/jobs/build-artifacts.yml b/eng/templates/official/jobs/build-artifacts.yml index 12426c57..6c425a32 100644 --- a/eng/templates/official/jobs/build-artifacts.yml +++ b/eng/templates/official/jobs/build-artifacts.yml @@ -15,16 +15,16 @@ jobs: artifactName: "azure-functions" steps: + - task: PipAuthenticate@1 + displayName: 'Pip Authenticate' + inputs: + artifactFeeds: 'internal/upstream' - task: UsePythonVersion@0 inputs: versionSpec: "3.11" - bash: | python --version displayName: 'Check python version' - - task: PipAuthenticate@1 - displayName: 'Pip Authenticate' - inputs: - artifactFeeds: 'internal/PythonSDK_Internal_PublicPackages' - bash: | python -m pip install -U pip python -m pip install build diff --git a/eng/templates/official/release/build-artifacts.yml b/eng/templates/official/release/build-artifacts.yml index 67b5c47c..532bb8e3 100644 --- a/eng/templates/official/release/build-artifacts.yml +++ b/eng/templates/official/release/build-artifacts.yml @@ -49,6 +49,10 @@ jobs: artifactName: ${{ parameters.artifactName }} steps: + - task: PipAuthenticate@1 + displayName: 'Pip Authenticate' + inputs: + artifactFeeds: 'internal/upstream' - ${{ if ne(parameters.libraryVersion, '') }}: - checkout: none - bash: | @@ -62,10 +66,6 @@ jobs: - bash: | python --version displayName: 'Check python version' - - task: PipAuthenticate@1 - displayName: 'Pip Authenticate' - inputs: - artifactFeeds: 'internal/PythonSDK_Internal_PublicPackages' - bash: | python -m pip install -U pip python -m pip install build From 04d810d56f65eb44c27bf6b820c3023fae948967 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Fri, 31 Jul 2026 07:29:35 -0500 Subject: [PATCH 2/5] update pip audit --- eng/templates/jobs/build.yml | 2 +- eng/templates/official/jobs/build-artifacts.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/templates/jobs/build.yml b/eng/templates/jobs/build.yml index e9672984..0c1fe92a 100644 --- a/eng/templates/jobs/build.yml +++ b/eng/templates/jobs/build.yml @@ -33,6 +33,6 @@ jobs: displayName: 'Build Python SDK for $(PYTHON_VERSION)' - bash: | pip install pip-audit - pip-audit . + pip-audit --vulnerability-service osv . displayName: 'Run vulnerability scan' condition: ne(variables['PYTHON_VERSION'], '3.7') diff --git a/eng/templates/official/jobs/build-artifacts.yml b/eng/templates/official/jobs/build-artifacts.yml index 6c425a32..45cacdce 100644 --- a/eng/templates/official/jobs/build-artifacts.yml +++ b/eng/templates/official/jobs/build-artifacts.yml @@ -32,5 +32,5 @@ jobs: displayName: 'Build Python SDK' - bash: | pip install pip-audit - pip-audit . + pip-audit --vulnerability-service osv . displayName: 'Run vulnerability scan' From 8e6f17e7565ba56b56b20aed450c0792840f558c Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Fri, 31 Jul 2026 07:40:53 -0500 Subject: [PATCH 3/5] extra pip auth flaf --- eng/templates/jobs/build.yml | 1 + eng/templates/jobs/ci-tests.yml | 1 + eng/templates/official/jobs/build-artifacts.yml | 1 + eng/templates/official/release/build-artifacts.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/eng/templates/jobs/build.yml b/eng/templates/jobs/build.yml index 0c1fe92a..8675d971 100644 --- a/eng/templates/jobs/build.yml +++ b/eng/templates/jobs/build.yml @@ -20,6 +20,7 @@ jobs: displayName: 'Pip Authenticate' inputs: artifactFeeds: 'public/upstream-public' + onlyAddExtraIndex: false - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) diff --git a/eng/templates/jobs/ci-tests.yml b/eng/templates/jobs/ci-tests.yml index 25cb040f..5617f4ae 100644 --- a/eng/templates/jobs/ci-tests.yml +++ b/eng/templates/jobs/ci-tests.yml @@ -24,6 +24,7 @@ jobs: displayName: 'Pip Authenticate' inputs: artifactFeeds: ${{ parameters.artifactFeed }} + onlyAddExtraIndex: false - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) diff --git a/eng/templates/official/jobs/build-artifacts.yml b/eng/templates/official/jobs/build-artifacts.yml index 45cacdce..73e6225e 100644 --- a/eng/templates/official/jobs/build-artifacts.yml +++ b/eng/templates/official/jobs/build-artifacts.yml @@ -19,6 +19,7 @@ jobs: displayName: 'Pip Authenticate' inputs: artifactFeeds: 'internal/upstream' + onlyAddExtraIndex: false - task: UsePythonVersion@0 inputs: versionSpec: "3.11" diff --git a/eng/templates/official/release/build-artifacts.yml b/eng/templates/official/release/build-artifacts.yml index 532bb8e3..6f284206 100644 --- a/eng/templates/official/release/build-artifacts.yml +++ b/eng/templates/official/release/build-artifacts.yml @@ -53,6 +53,7 @@ jobs: displayName: 'Pip Authenticate' inputs: artifactFeeds: 'internal/upstream' + onlyAddExtraIndex: false - ${{ if ne(parameters.libraryVersion, '') }}: - checkout: none - bash: | From 48f9c1015566639f336583977218d216fc2009fa Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Fri, 31 Jul 2026 08:01:20 -0500 Subject: [PATCH 4/5] remove pip audit (temporarily) --- eng/templates/jobs/build.yml | 5 ----- eng/templates/official/jobs/build-artifacts.yml | 4 ---- 2 files changed, 9 deletions(-) diff --git a/eng/templates/jobs/build.yml b/eng/templates/jobs/build.yml index 8675d971..ac176959 100644 --- a/eng/templates/jobs/build.yml +++ b/eng/templates/jobs/build.yml @@ -32,8 +32,3 @@ jobs: python -m pip install build python -m build displayName: 'Build Python SDK for $(PYTHON_VERSION)' - - bash: | - pip install pip-audit - pip-audit --vulnerability-service osv . - displayName: 'Run vulnerability scan' - condition: ne(variables['PYTHON_VERSION'], '3.7') diff --git a/eng/templates/official/jobs/build-artifacts.yml b/eng/templates/official/jobs/build-artifacts.yml index 73e6225e..f719b69e 100644 --- a/eng/templates/official/jobs/build-artifacts.yml +++ b/eng/templates/official/jobs/build-artifacts.yml @@ -31,7 +31,3 @@ jobs: python -m pip install build python -m build displayName: 'Build Python SDK' - - bash: | - pip install pip-audit - pip-audit --vulnerability-service osv . - displayName: 'Run vulnerability scan' From 0966f1d941e3e7d4b136befcb2d11da19295e4d1 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Fri, 31 Jul 2026 09:27:24 -0500 Subject: [PATCH 5/5] revert feed change --- eng/ci/official-build.yml | 2 +- eng/ci/public-build.yml | 2 +- eng/templates/jobs/build.yml | 2 +- eng/templates/official/jobs/build-artifacts.yml | 2 +- eng/templates/official/release/build-artifacts.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml index 4f499ff7..8a6dcacd 100644 --- a/eng/ci/official-build.yml +++ b/eng/ci/official-build.yml @@ -49,4 +49,4 @@ extends: jobs: - template: /eng/templates/jobs/ci-tests.yml@self parameters: - artifactFeed: 'internal/upstream' + artifactFeed: 'internal/PythonSDK_Internal_PublicPackages' diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml index 0352b03a..6805c560 100644 --- a/eng/ci/public-build.yml +++ b/eng/ci/public-build.yml @@ -49,4 +49,4 @@ extends: jobs: - template: /eng/templates/jobs/ci-tests.yml@self parameters: - artifactFeed: 'public/upstream-public' + artifactFeed: 'public/PythonSDK_PublicPackages' diff --git a/eng/templates/jobs/build.yml b/eng/templates/jobs/build.yml index ac176959..de6845d9 100644 --- a/eng/templates/jobs/build.yml +++ b/eng/templates/jobs/build.yml @@ -19,7 +19,7 @@ jobs: - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: 'public/upstream-public' + artifactFeeds: 'public/PythonSDK_PublicPackages' onlyAddExtraIndex: false - task: UsePythonVersion@0 inputs: diff --git a/eng/templates/official/jobs/build-artifacts.yml b/eng/templates/official/jobs/build-artifacts.yml index f719b69e..287fbd2b 100644 --- a/eng/templates/official/jobs/build-artifacts.yml +++ b/eng/templates/official/jobs/build-artifacts.yml @@ -18,7 +18,7 @@ jobs: - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: 'internal/upstream' + artifactFeeds: 'internal/PythonSDK_Internal_PublicPackages' onlyAddExtraIndex: false - task: UsePythonVersion@0 inputs: diff --git a/eng/templates/official/release/build-artifacts.yml b/eng/templates/official/release/build-artifacts.yml index 6f284206..aee1a2ca 100644 --- a/eng/templates/official/release/build-artifacts.yml +++ b/eng/templates/official/release/build-artifacts.yml @@ -52,7 +52,7 @@ jobs: - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: 'internal/upstream' + artifactFeeds: 'internal/PythonSDK_Internal_PublicPackages' onlyAddExtraIndex: false - ${{ if ne(parameters.libraryVersion, '') }}: - checkout: none