[devops] Unify and simplify provisionator provisioning. (#21268)

This should speed up getting bots ready, since now we only run the
provisionator once for each bot, and we also don't try to provision the
same thing multiple times.

.gitignore

@@ -34,9 +34,7 @@ tests/bcl-test/SystemCoreXunit*.csproj
 tests/bcl-test/SystemXunit.csproj
 global.json
 .idea
-device-tests-provisioning.csx
-build-provisioning.csx
-provision-xcode.csx
+provision-shared.csx
 mono_crash.*.json
 *.binlog
 .vscode

tools/devops/Makefile

@@ -1,44 +1,13 @@
 TOP=../..
 include $(TOP)/Make.config
 
-device-tests-provisioning.csx: device-tests-provisioning.csx.in Makefile $(TOP)/Make.config
-	$(Q_GEN) sed \
-		-e 's#@XCODE_XIP_NAME@#$(notdir $(XCODE_URL))#g' \
-		-e 's#@MONO_PACKAGE@#$(MIN_MONO_URL)#g' \
-		-e 's#@MIN_SHARPIE_URL@#$(MIN_SHARPIE_URL)#g' \
-		-e 's#@INCLUDE_MAC@#$(INCLUDE_MAC)#g' \
-		-e 's#@INCLUDE_IOS@#$(INCLUDE_IOS)#g' \
-		-e 's#@INCLUDE_TVOS@#$(INCLUDE_TVOS)#g' \
-		-e 's#@INCLUDE_WATCH@#$(INCLUDE_WATCH)#g' \
-		$< > $@;
-		@echo "Generated $@:"
-		@cat $@
-
-build-provisioning.csx: build-provisioning.csx.in Makefile $(TOP)/Make.config
+provision-shared.csx: provision-shared.in.csx Makefile $(TOP)/Make.config
 	$(Q_GEN) sed \
 		-e 's#@XCODE_XIP_NAME@#$(notdir $(XCODE_URL))#g' \
+		-e 's#@XCODE_ROOT_PATH@#$(XCODE_DEVELOPER_ROOT)#g' \
 		-e 's#@MONO_PACKAGE@#$(MIN_MONO_URL)#g' \
 		-e 's#@MIN_SHARPIE_URL@#$(MIN_SHARPIE_URL)#g' \
-		$< > $@;
-		@echo "Generated $@:"
-		@cat $@
-
-mac-tests-provisioning.csx: mac-tests-provisioning.csx.in Makefile $(TOP)/Make.config
-	$(Q_GEN) sed \
-		-e 's#@MONO_PACKAGE@#$(MIN_MONO_URL)#g' \
-		-e 's#@INCLUDE_MAC@#$(INCLUDE_MAC)#g' \
-		-e 's#@INCLUDE_IOS@#$(INCLUDE_IOS)#g' \
-		$< > $@;
-		@echo "Generated $@:"
-		@cat $@
-
-provision-xcode.csx: provision-xcode.csx.in Makefile $(TOP)/Make.config
-	$(Q_GEN) sed \
-		-e 's#@XCODE_XIP_NAME@#$(notdir $(XCODE_URL))#g' \
-		-e 's#@XCODE_ROOT_PATH@#$(XCODE_DEVELOPER_ROOT)#g' \
-		$< > $@;
-		@echo "Generated $@:"
-		@cat $@
+		$< > $@
 
 LocProject.json: LocProject.json.in Makefile $(TOP)/Make.config
 	$(Q_GEN) sed \
@@ -65,4 +34,4 @@ print-variable:
 print-variable-value-to-file:
 	@echo $($(VARIABLE)) > "$(FILE)"
 
-provisioning: build-provisioning.csx device-tests-provisioning.csx provision-xcode.csx
+provisioning: provision-shared.csx

tools/devops/automation/templates/build/build.yml

@@ -64,18 +64,8 @@ steps:
       MacDeveloper: $(mac-developer)
       HostedMacKeychainPassword: ${{ parameters.keyringPass }}
 
-  - task: xamops.azdevex.provisionator-task.provisionator@2
-    displayName: 'Provision Brew components'
-    inputs:
-      provisioning_script: $(Build.SourcesDirectory)/xamarin-macios/tools/devops/provision-brew-packages.csx
-      provisioning_extra_args: '-vvvv'
-      github_token: ${{ parameters.gitHubToken }}
-    timeoutInMinutes: 30
-    enabled: true
-    continueOnError: true  # brew installation can be temperamental, and things usually work even if the installation fail.
-
   - bash: |
-      make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops build-provisioning.csx
+      make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops provisioning
     displayName: 'Generate provisionator files.'
 
   - task: xamops.azdevex.provisionator-task.provisionator@2

tools/devops/automation/templates/tests/build.yml

@@ -220,7 +220,7 @@ steps:
   timeoutInMinutes: 5
 
 - bash: |
-    make -C $(System.DefaultWorkingDirectory)/xamarin-macios/tools/devops/ device-tests-provisioning.csx
+    make -C $(System.DefaultWorkingDirectory)/xamarin-macios/tools/devops/ provisioning
   displayName: 'Generate Provisionator csx file'
 
 # Executed ONLY if we want to clear the provisionator cache.
@@ -234,19 +234,7 @@ steps:
 - task: xamops.azdevex.provisionator-task.provisionator@2
   displayName: 'Provision dependencies'
   inputs:
-    provisioning_script: $(System.DefaultWorkingDirectory)/xamarin-macios/tools/devops/device-tests-provisioning.csx
-    provisioning_extra_args: '-vvvv'
-    github_token: ${{ parameters.gitHubToken }}
-  timeoutInMinutes: 250
-
-- bash: |
-    make -C $(System.DefaultWorkingDirectory)/xamarin-macios/tools/devops/ mac-tests-provisioning.csx
-  displayName: 'Generate Provisionator csx file for macOS'
-
-- task: xamops.azdevex.provisionator-task.provisionator@2
-  displayName: 'Provision Xamarin.Mac'
-  inputs:
-    provisioning_script: $(Build.SourcesDirectory)/xamarin-macios/tools/devops/mac-tests-provisioning.csx
+    provisioning_script: $(System.DefaultWorkingDirectory)/xamarin-macios/tools/devops/build-provisioning.csx
     provisioning_extra_args: '-vvvv'
     github_token: ${{ parameters.gitHubToken }}
   timeoutInMinutes: 250

tools/devops/automation/templates/windows/reserve-mac.yml

@@ -85,7 +85,7 @@ steps:
     $vsts.Agents.SetEnabled($pool, $agent, $False)
   displayName: "Disable macOS bot from pool"
 
-- bash: make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops provision-xcode.csx
+- bash: make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops provisioning
   displayName: 'Generate Xcode provisioning csx file'
 
 - task: xamops.azdevex.provisionator-task.provisionator@2

tools/devops/build-provisioning.csx

@@ -0,0 +1,8 @@
+#load "provision-shared.csx"
+
+if (!ProvisionXcode ())
+	return 1;
+ProvisionMono ();
+ProvisionSharpie ();
+ProvisionBrewPackages ();
+SetDefaultXcodeInVSMac ();

tools/devops/provision-brew-packages.csx

@@ -1,9 +1,3 @@
-BrewPackages (
-    "shellcheck",
-    "yamllint",
-    "cmake", 
-    "p7zip",
-    "msitools",
-    "wget",
-    "azure-cli"
- );
+#load "provision-shared.csx"
+
+ProvisionBrewPackages ();