Skip to content

Commit a43d7e9

Browse files
rmarinhotj-devel709
authored andcommitted
Revert "[ci] Run provisionator devdiv (#28056)" (#28079)
This reverts commit 9d82993.
1 parent 50a8a83 commit a43d7e9

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

eng/pipelines/common/ui-tests-build-sample.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
version: '' #the iOS version'
88
provisionatorChannel: 'latest'
99
agentPoolAccessToken: ''
10-
provisioning: false
10+
skipProvisioning: true
1111
configuration : "Release"
1212
testFilter: ''
1313
runtimeVariant: 'Mono'
@@ -27,11 +27,11 @@ steps:
2727
skipAndroidSdks: false
2828
skipXcode: ${{ or(eq(parameters.platform, 'android'), eq(parameters.platform, 'windows')) }}
2929
provisionatorChannel: ${{ parameters.provisionatorChannel }}
30-
${{ if parameters.provisioning }}:
30+
${{ if parameters.skipProvisioning }}:
31+
skipProvisionator: true
32+
${{ else }}:
3133
skipProvisionator: false
3234
gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
33-
${{ else }}:
34-
skipProvisionator: true
3535

3636
- task: PowerShell@2
3737
condition: ne('${{ parameters.platform }}' , 'windows')

eng/pipelines/common/ui-tests-steps.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parameters:
1111
runtimeVariant : "Mono"
1212
testFilter: ''
1313
testConfigurationArgs: ''
14-
provisioning: false
14+
skipProvisioning: true
1515

1616
steps:
1717
- task: DownloadPipelineArtifact@2
@@ -50,11 +50,11 @@ steps:
5050
skipAndroidSdks: ${{ ne(parameters.platform, 'android') }}
5151
skipXcode: ${{ or(eq(parameters.platform, 'android'), eq(parameters.platform, 'windows')) }}
5252
provisionatorChannel: ${{ parameters.provisionatorChannel }}
53-
${{ if parameters.provisioning }}:
53+
${{ if parameters.skipProvisioning }}:
54+
skipProvisionator: true
55+
${{ else }}:
5456
skipProvisionator: false
5557
gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
56-
${{ else }}:
57-
skipProvisionator: true
5858

5959
- task: PowerShell@2
6060
condition: ne('${{ parameters.platform }}' , 'windows')

eng/pipelines/common/ui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ stages:
5555
- template: ui-tests-build-sample.yml
5656
parameters:
5757
runtimeVariant: "Mono"
58-
provisioning: ${{ parameters.skipProvisioning }}
58+
skipProvisioning: ${{ parameters.skipProvisioning }}
5959

6060
- ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
6161
- stage: build_ui_tests_nativeaot

eng/pipelines/device-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ stages:
130130
catalystVersions: [ 'latest' ]
131131
windowsVersions: ['packaged', 'unpackaged']
132132
provisionatorChannel: ${{ parameters.provisionatorChannel }}
133-
skipProvisioning: false
133+
skipProvisioning: ${{ or(not(parameters.UseProvisionator), false) }}
134134
${{ else }}:
135135
androidApiLevels: [ 33, 23 ]
136136
iosVersions: [ 'simulator-18.0' ]

eng/pipelines/ui-tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,17 @@ stages:
142142
androidApiLevels: [ 30 ]
143143
iosVersions: [ '18.0' ]
144144
provisionatorChannel: ${{ parameters.provisionatorChannel }}
145-
skipProvisioning: false
146145
${{ else }}:
147146
androidApiLevels: [ 30 ]
148147
iosVersions: [ '18.0' ]
149148
provisionatorChannel: ${{ parameters.provisionatorChannel }}
150-
${{ if parameters.UseProvisionator }}:
151-
skipProvisioning: false
152149
${{ if parameters.CompatibilityTests }}:
153150
runCompatibilityTests: true
154-
151+
${{ if or(parameters.UseProvisionator, eq(variables['internalProvisioning'],'true') ) }}:
152+
skipProvisioning: false
153+
gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
154+
${{ else }}:
155+
skipProvisioning: true
155156
projects:
156157
- name: controls
157158
desc: Controls

eng/provisioning/xcode.csx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ else
3737

3838
Console.WriteLine("Selected version: {0}", item.Version);
3939
item.XcodeSelect()
40-
.SimulatorRuntime(SimRuntime.iOS);
40+
.SimulatorRuntime(SimRuntime.iOS)
4141
// .SimulatorRuntime(SimRuntime.watchOS)
4242
// .SimulatorRuntime(SimRuntime.visionOS);
43-
// .SimulatorRuntime(SimRuntime.tvOS);
43+
.SimulatorRuntime(SimRuntime.tvOS);
4444

4545
LogInstalledXcodes();
4646

0 commit comments

Comments
 (0)