Skip to content

Commit 74befd6

Browse files
CBL-Mariner-BotPawelWMSjslobodzian
authored
[AUTO-CHERRYPICK] Replaced PyPi's junit-xml with AZL's python3-junit-xml - branch 3.0-dev (#14457)
Co-authored-by: Pawel Winogrodzki <[email protected]> Co-authored-by: jslobodzian <[email protected]>
1 parent 7edaec6 commit 74befd6

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

.pipelines/templates/PackageBuild.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ parameters:
134134
type: string
135135
default: ""
136136

137-
- name: pipArtifactFeeds
138-
type: string
139-
default: ""
140-
141137
- name: publishLogs
142138
type: boolean
143139
default: true
@@ -167,12 +163,6 @@ steps:
167163
parameters:
168164
buildRepoRoot: ${{ parameters.buildRepoRoot }}
169165

170-
- ${{ if parameters.pipArtifactFeeds }}:
171-
- task: PipAuthenticate@1
172-
inputs:
173-
artifactFeeds: "${{ parameters.pipArtifactFeeds }}"
174-
displayName: "Authenticate to custom pip artifact feeds"
175-
176166
- ${{ if parameters.customToolchainTarballName }}:
177167
- script: |
178168
toolchain_archive="$(find "${{ parameters.inputArtifactsFolder }}" -name "${{ parameters.customToolchainTarballName }}" -print -quit)"

.pipelines/templates/PackageBuildPRCheck.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ stages:
136136
maxCPU: "${{ configuration.maxCPUs }}"
137137
outputArtifactsFolder: $(ob_outputDirectory)
138138
outputRPMsTarballName: $(outputRPMsTarballName)
139-
pipArtifactFeeds: "mariner/Mariner-Pypi-Feed"
140139
selfRepoName: self
141140
testSuiteName: "[${{ configuration.name }}] Package test"
142141

@@ -197,7 +196,6 @@ stages:
197196
isUseCCache: true
198197
maxCPU: "${{ configuration.maxCPUs }}"
199198
outputArtifactsFolder: $(ob_outputDirectory)
200-
pipArtifactFeeds: "mariner/Mariner-Pypi-Feed"
201199
selfRepoName: self
202200
srpmPackList: "$(testListFromToolchain)"
203201
testRerunList: "$(testListFromToolchain)"

.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)