Skip to content

Commit 1e8f100

Browse files
[2.0] Replaced PyPi's junit-xml module with AZL's python3-junit-xml package. (microsoft#14267)
Co-authored-by: jslobodzian <[email protected]>
1 parent 9237b2e commit 1e8f100

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

.pipelines/prchecks/PackageBuildPRCheck.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ extends:
145145
maxCPU: "${{ configuration.maxCPUs }}"
146146
outputArtifactsFolder: $(ob_outputDirectory)
147147
outputRPMsTarballName: $(outputRPMsTarballName)
148-
pipArtifactFeeds: "mariner/Mariner-Pypi-Feed"
149148
selfRepoName: self
150149
testSuiteName: "[${{ configuration.name }}] Package test"
151150

@@ -204,7 +203,6 @@ extends:
204203
isUseCCache: true
205204
maxCPU: "${{ configuration.maxCPUs }}"
206205
outputArtifactsFolder: $(ob_outputDirectory)
207-
pipArtifactFeeds: "mariner/Mariner-Pypi-Feed"
208206
selfRepoName: self
209207
srpmPackList: "$(testListFromToolchain)"
210208
testRerunList: "$(testListFromToolchain)"

.pipelines/templates/PackageBuild.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ parameters:
121121
type: string
122122
default: ""
123123

124-
- name: pipArtifactFeeds
125-
type: string
126-
default: ""
127-
128124
- name: publishLogs
129125
type: boolean
130126
default: true
@@ -154,12 +150,6 @@ steps:
154150
parameters:
155151
buildRepoRoot: ${{ parameters.buildRepoRoot }}
156152

157-
- ${{ if parameters.pipArtifactFeeds }}:
158-
- task: PipAuthenticate@1
159-
inputs:
160-
artifactFeeds: "${{ parameters.pipArtifactFeeds }}"
161-
displayName: "Authenticate to custom pip artifact feeds"
162-
163153
- ${{ if parameters.customToolchainTarballName }}:
164154
- script: |
165155
toolchain_archive="$(find "${{ parameters.inputArtifactsFolder }}" -name "${{ parameters.customToolchainTarballName }}" -print -quit)"

.pipelines/templates/PackageTestResultsAnalysis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ parameters:
3232
default: "$(Agent.TempDirectory)"
3333

3434
steps:
35-
# TODO: the "--index-url" argument must be removed once accessing internal ADO feeds from fork PR checks is supported.
36-
- bash: pip3 install --user junit_xml==1.9 --index-url https://pypi.org/simple
37-
retryCountOnTaskFailure: 3
35+
- bash: sudo tdnf install -y python3-junit-xml
3836
displayName: "Install Python dependencies"
3937

4038
- task: PythonScript@0

0 commit comments

Comments
 (0)