Move the Formatting jobs over to AzDO (#24367)

* First stab at running the format jobs in AzDO.

* Add display names for formatting jobs.

* Try to use a python version in the path

* Try to fix bootstrap download.

* Use imported paths. Output python major version.

* Clean up imports.

* Fix imports.

* Try just using urlretrieve again

* Cleanup

* Add back killing spurious dotnet processes.

* Try leaving all shutdown/kill work to AzDO.

* PR Feedback.

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e783cc1..ec7e4d0 100644 (file)
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -310,6 +310,14 @@ jobs:
         readyToRun: true
         displayNameArgs: R2R
 
+# Format
+- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI'), eq(variables['Build.DefinitionName'], 'coreclr-ci')) }}:
+  - template: eng/platform-matrix.yml
+    parameters:
+      jobTemplate: format-job.yml
+      platforms:
+      - Linux_x64
+      - Windows_NT_x64
 
 # Publish build information to Build Assets Registry
 

diff --git a/eng/format-job.yml b/eng/format-job.yml
new file mode 100644 (file)
index 0000000..fb11a0c
--- /dev/null
+++ b/eng/format-job.yml
@@ -0,0 +1,41 @@
+parameters:
+  buildConfig: ''
+  archType: ''
+  osGroup: ''
+  osIdentifier: ''
+  containerName: ''
+  crossrootfsDir: ''
+  timeoutInMinutes: ''
+
+### Format job
+jobs:
+- template: xplat-job.yml
+  parameters:
+    buildConfig: ${{ parameters.buildConfig }}
+    archType: ${{ parameters.archType }}
+    osGroup: ${{ parameters.osGroup }}
+    osIdentifier: ${{ parameters.osIdentifier }}
+    containerName: ${{ parameters.containerName }}
+    crossrootfsDir: ${{ parameters.crossrootfsDir }}
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+    name: ${{ format('format_{0}_{1}', parameters.osIdentifier, parameters.archType) }}
+    displayName: ${{ format('Formatting {0} {1}', parameters.osIdentifier, parameters.archType) }}
+    helixType: 'format'
+    steps:
+    - task: DotNetCoreInstaller@0
+      inputs:
+        packageType: 'sdk'
+        version: '2.1.402'
+    - task: PythonScript@0
+      displayName: Run tests/scripts/format.py
+      inputs:
+        scriptSource: 'filePath'
+        scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
+        arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
+    - task: PublishBuildArtifacts@1
+      displayName: Publish format.patch
+      inputs:
+        PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
+        ArtifactName: $(osGroup).$(archType) format.patch
+      continueOnError: true
+      condition: failed()

diff --git a/netci.groovy b/netci.groovy
index cda093c..bb31ba9 100755 (executable)
--- a/netci.groovy
+++ b/netci.groovy
@@ -154,7 +154,6 @@ class Constants {
                'ilrt',
                'r2r',
                'longgc',
-               'formatting',
                'gcsimulator',
                // 'jitdiff', // jitdiff is currently disabled, until someone spends the effort to make it fully work
                'standalone_gc',

diff --git a/tests/scripts/format.py b/tests/scripts/format.py
index 5ed9096..d92df58 100644 (file)
--- a/tests/scripts/format.py
+++ b/tests/scripts/format.py
@@ -23,9 +23,9 @@ import shutil
 # Version specific imports
 
 if sys.version_info.major < 3:
-    import urllib
+    from urllib import urlretrieve
 else:
-    import urllib.request
+    from urllib.request import urlretrieve
 
 def expandPath(path):
     return os.path.abspath(os.path.expanduser(path))
@@ -69,67 +69,6 @@ def main(argv):
 
     my_env = os.environ
 
-    # Download .NET CLI
-
-    dotnetcliUrl = ""
-    dotnetcliFilename = ""
-
-    # build.cmd removes the Tools directory, so we need to put our version of jitutils
-    # outside of the Tools directory
-    # must use short path here to avoid trouble on windows
-
-    dotnetcliPath = os.path.join(coreclr, 'dj')
-
-    # Try to make the dotnetcli-jitutils directory if it doesn't exist
-
-    try:
-        os.makedirs(dotnetcliPath)
-    except OSError:
-        if not os.path.isdir(dotnetcliPath):
-            raise
-
-    print("Downloading .NET CLI")
-    if platform == 'Linux':
-        dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.402/dotnet-sdk-2.1.402-linux-x64.tar.gz"
-        dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.tar.gz')
-    elif platform == 'OSX':
-        dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.402/dotnet-sdk-2.1.402-osx-x64.tar.gz"
-        dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.tar.gz')
-    elif platform == 'Windows_NT':
-        dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.402/dotnet-sdk-2.1.402-win-x64.zip"
-        dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.zip')
-    else:
-        print('Unknown os ', os)
-        return -1
-
-    urlretrieve = urllib.urlretrieve if sys.version_info.major < 3 else urllib.request.urlretrieve
-    urlretrieve(dotnetcliUrl, dotnetcliFilename)
-
-    if not os.path.isfile(dotnetcliFilename):
-        print("Did not download .NET CLI!")
-        return -1
-
-    # Install .NET CLI
-
-    if platform == 'Linux' or platform == 'OSX':
-        tar = tarfile.open(dotnetcliFilename)
-        tar.extractall(dotnetcliPath)
-        tar.close()
-    elif platform == 'Windows_NT':
-        with zipfile.ZipFile(dotnetcliFilename, "r") as z:
-            z.extractall(dotnetcliPath)
-
-    dotnet = ""
-    if platform == 'Linux' or platform == 'OSX':
-        dotnet = "dotnet"
-    elif platform == 'Windows_NT':
-        dotnet = "dotnet.exe"
-
-
-    if not os.path.isfile(os.path.join(dotnetcliPath, dotnet)):
-        print("Did not extract .NET CLI from download")
-        return -1
-
     # Download bootstrap
 
     bootstrapFilename = ""
@@ -163,8 +102,6 @@ def main(argv):
     print(bootstrapPath)
 
     # Run bootstrap
-
-    my_env["PATH"] = dotnetcliPath + os.pathsep + my_env["PATH"]
     if platform == 'Linux' or platform == 'OSX':
         print("Running bootstrap")
         proc = subprocess.Popen(['bash', bootstrapPath], env=my_env)
@@ -226,25 +163,10 @@ def main(argv):
         proc = subprocess.Popen(["git", "diff", "--patch", "-U20"], env=my_env, stdout=patchFile)
         output,error = proc.communicate()
 
-    # shutdown the dotnet build servers before cleaning things up
-    proc = subprocess.Popen(["dotnet", "build-server", "shutdown"], env=my_env)
-    output,error = proc.communicate()
-
-    # shutdown all spurious dotnet processes using os shell
-    if platform == 'Linux' or platform == 'OSX':
-        subprocess.call(['killall', '-SIGTERM', '-qw', dotnet])
-    elif platform == 'Windows_NT':
-        utilpath = os.path.join(coreclr, 'tests\\scripts\\kill-all.cmd')
-        subprocess.call([utilpath, dotnet])
-
     if os.path.isdir(jitUtilsPath):
         print("Deleting " + jitUtilsPath)
         shutil.rmtree(jitUtilsPath, onerror=del_rw)
 
-    if os.path.isdir(dotnetcliPath):
-        print("Deleting " + dotnetcliPath)
-        shutil.rmtree(dotnetcliPath, onerror=del_rw)
-
     if os.path.isfile(bootstrapPath):
         print("Deleting " + bootstrapPath)
         os.remove(bootstrapPath)