From 3b7ed3efcf48b2b88fd9350be419e89df41042b7 Mon Sep 17 00:00:00 2001 From: Fabio Cavalcante Date: Fri, 31 Jul 2026 13:00:35 -0700 Subject: [PATCH] build: route Python restores through CFS Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d2a4d401-79d8-401a-b867-8899af55f218 --- eng/ci/official-build.yml | 1 - eng/ci/public-build.yml | 1 - eng/templates/jobs/build.yml | 9 +-- .../official/jobs/build-artifacts.yml | 9 +-- .../official/jobs/publish-release.yml | 9 +-- eng/templates/official/jobs/unit-tests.yml | 66 ++++++++++--------- 6 files changed, 50 insertions(+), 45 deletions(-) diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml index 0878569..ec0c832 100644 --- a/eng/ci/official-build.yml +++ b/eng/ci/official-build.yml @@ -49,4 +49,3 @@ extends: - template: /eng/templates/official/jobs/unit-tests.yml@self parameters: PoolName: 1es-pool-azfunc - ArtifactFeed: internal/PythonExtensions_Internal_PublicPackages diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml index 80a9228..fca91a3 100644 --- a/eng/ci/public-build.yml +++ b/eng/ci/public-build.yml @@ -49,4 +49,3 @@ extends: - template: /eng/templates/official/jobs/unit-tests.yml@self parameters: PoolName: 1es-pool-azfunc-public - ArtifactFeed: public/PythonExtensions_PublicPackages diff --git a/eng/templates/jobs/build.yml b/eng/templates/jobs/build.yml index 0b1c144..250d66b 100644 --- a/eng/templates/jobs/build.yml +++ b/eng/templates/jobs/build.yml @@ -27,13 +27,14 @@ jobs: EXTENSION_NAME: 'Connectors' steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.11' - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: public/PythonExtensions_PublicPackages + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.11' - bash: | python --version displayName: 'Check python version' diff --git a/eng/templates/official/jobs/build-artifacts.yml b/eng/templates/official/jobs/build-artifacts.yml index 4146511..1a607b6 100644 --- a/eng/templates/official/jobs/build-artifacts.yml +++ b/eng/templates/official/jobs/build-artifacts.yml @@ -33,13 +33,14 @@ jobs: artifactName: "$(EXTENSION_DIRECTORY)" steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.11' - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: internal/PythonExtensions_Internal_PublicPackages + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.11' - bash: | python --version displayName: 'Check python version' diff --git a/eng/templates/official/jobs/publish-release.yml b/eng/templates/official/jobs/publish-release.yml index d166ffd..59a1a34 100644 --- a/eng/templates/official/jobs/publish-release.yml +++ b/eng/templates/official/jobs/publish-release.yml @@ -210,14 +210,15 @@ jobs: buildVersionToDownload: latestFromBranch branchName: refs/heads/dev targetPath: PythonExtensionArtifact + - task: PipAuthenticate@1 + displayName: 'Pip Authenticate' + inputs: + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false - task: UsePythonVersion@0 displayName: 'Use Python 3.11' inputs: versionSpec: 3.11 - - task: PipAuthenticate@1 - displayName: 'Pip Authenticate' - inputs: - artifactFeeds: internal/PythonExtensions_Internal_PublicPackages - pwsh: | $newLibraryVersion = "$(NewLibraryVersion)" $pypiToken = "$(PypiToken)" diff --git a/eng/templates/official/jobs/unit-tests.yml b/eng/templates/official/jobs/unit-tests.yml index bf44241..3146443 100644 --- a/eng/templates/official/jobs/unit-tests.yml +++ b/eng/templates/official/jobs/unit-tests.yml @@ -2,9 +2,6 @@ parameters: - name: PoolName type: string default: '' - - name: ArtifactFeed - type: string - default: '' - name: python_versions type: object default: @@ -28,13 +25,14 @@ jobs: matrix: ${{ parameters.python_versions }} condition: always() steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: ${{ parameters.ArtifactFeed }} + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) - bash: | python -m pip install --upgrade pip cd azurefunctions-extensions-base @@ -51,13 +49,14 @@ jobs: matrix: ${{ parameters.python_versions }} condition: always() steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: ${{ parameters.ArtifactFeed }} + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) - bash: | python -m pip install --upgrade pip cd azurefunctions-extensions-bindings-blob @@ -82,13 +81,14 @@ jobs: matrix: ${{ parameters.python_versions }} condition: always() steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: ${{ parameters.ArtifactFeed }} + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) - bash: | python -m pip install --upgrade pip cd azurefunctions-extensions-bindings-cosmosdb @@ -108,13 +108,14 @@ jobs: matrix: ${{ parameters.python_versions }} condition: always() steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: ${{ parameters.ArtifactFeed }} + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) - bash: | python -m pip install --upgrade pip cd azurefunctions-extensions-bindings-eventhub @@ -131,13 +132,14 @@ jobs: matrix: ${{ parameters.python_versions }} condition: always() steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: ${{ parameters.ArtifactFeed }} + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) - bash: | python -m pip install --upgrade pip cd azurefunctions-extensions-http-fastapi @@ -154,13 +156,14 @@ jobs: matrix: ${{ parameters.python_versions }} condition: always() steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: ${{ parameters.ArtifactFeed }} + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) - bash: | python -m pip install --upgrade pip cd azurefunctions-extensions-bindings-servicebus @@ -177,13 +180,14 @@ jobs: matrix: ${{ parameters.python_versions }} condition: always() steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - task: PipAuthenticate@1 displayName: 'Pip Authenticate' inputs: - artifactFeeds: ${{ parameters.ArtifactFeed }} + artifactFeeds: public/upstream-public + onlyAddExtraIndex: false + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) - bash: | python -m pip install --upgrade pip cd azurefunctions-extensions-connectors