Merge pull request #766 from microsoft/dev/dagood/merge-b1.18-from-1.18

[microsoft/dev.boringcrypto.go1.18] Merge 1.18 infra

eng/compliance/Guardian/execute-go-sdl-tools.ps1

@@ -10,6 +10,21 @@ $dotGitHubDirectory = Join-Path $srcDir ".github"
 # Official build artifacts, downloaded from the build job that completed earlier.
 $downloadedArtifactsDirectory = Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY "artifacts"
 
+# Remove verison number from the artifact path to make path-based issue suppression more reliable.
+foreach ($item in Get-ChildItem -Directory $downloadedArtifactsDirectory)
+{
+  if ($item.Name.StartsWith("go.") -and $item.Name.EndsWith(".extracted"))
+  {
+    $oldName = $item.FullName
+    $newName = $item.FullName -replace '\\go\.[0-9]+\.[0-9]+\.', '\go.'
+    if ($oldName -ne $newName)
+    {
+      Write-Host "Renaming '$oldName' to '$newName'"
+      Move-Item $oldName $newName
+    }
+  }
+}
+
 # Create a file for PoliCheck's ListFile option. The extension must be ".txt", and this file must
 # contain full paths, one per line, with no duplicates. The list should contain each microsoft/go
 # file but no upstream files. Sort and print it for debug purposes.

eng/pipeline/stages/pool-core.yml

@@ -23,22 +23,22 @@ stages:
         ${{ if parameters.public }}:
           ${{ if parameters.servicing }}:
             name: NetCore-Svc-Public
-          ${{ if not(parameters.servicing) }}:
+          ${{ else }}:
             name: NetCore-Public
-        ${{ if not(parameters.public) }}:
+        ${{ else }}:
           ${{ if parameters.servicing }}:
             name: NetCore1ESPool-Svc-Internal
-          ${{ if not(parameters.servicing) }}:
+          ${{ else }}:
             name: NetCore1ESPool-Internal
 
         # Pick images. https://helix.dot.net/#1esPools
         demands:
           ${{ if parameters.public }}:
             windows: ImageOverride -equals 1es-windows-2019-open
-          ${{ if not(parameters.public) }}:
+          ${{ else }}:
             windows: ImageOverride -equals 1es-windows-2019
 
           ${{ if parameters.public }}:
             linux: ImageOverride -equals 1es-ubuntu-2004-open
-          ${{ if not(parameters.public) }}:
+          ${{ else }}:
             linux: ImageOverride -equals 1es-ubuntu-2004

eng/pipeline/stages/publish-stage.yml

@@ -14,7 +14,7 @@ stages:
   - stage: Publish${{ parameters.public }}
     ${{ if parameters.public }}:
       displayName: Publish Public
-    ${{ if not(parameters.public) }}:
+    ${{ else }}:
       displayName: Publish Internal
     dependsOn: Sign
     jobs:
@@ -29,7 +29,7 @@ stages:
               value: 'https://dotnetbuildoutput.blob.core.windows.net/golang/microsoft'
             - name: blobSASArg
               value: --sas-token '$(dotnetbuildoutput-golang-write-sas-query)'
-          - ${{ if not(parameters.public) }}:
+          - ${{ else }}:
             - name: blobContainer
               value: 'https://golangartifacts.blob.core.windows.net/microsoft'
             - name: blobSASArg
@@ -88,7 +88,7 @@ stages:
             displayName: Publish build asset JSON to pipeline
             ${{ if parameters.public }}:
               artifact: BuildAssets
-            ${{ if not(parameters.public) }}:
+            ${{ else }}:
               artifact: BuildAssetsInternal
 
           - task: AzureCLI@2

eng/pipeline/stages/run-stage.yml

@@ -125,7 +125,7 @@ stages:
 
           # Use run-builder for any configuration that includes tests. run-builder uses the "gotestsum"
           # module to convert test results to a JUnit file that Azure DevOps can understand.
-          - ${{ if ne(parameters.builder.config, 'buildandpack') }}:
+          - ${{ else }}:
             - pwsh: |
                 if ($IsWindows) {
                   Write-Host "Removing Git usr\bin from PATH to avoid running a Linux test that would fail, 'TestScript/script_wait'..."

eng/pipeline/steps/init-submodule-task.yml

@@ -22,5 +22,5 @@ steps:
       env:
         FETCH_BEARER_TOKEN: $(System.AccessToken)
       displayName: Set up submodule from internal mirror
-    ${{ if eq(variables['System.TeamProject'], 'public') }}:
+    ${{ else }}:
       displayName: Set up submodule