Fix for pipelines broken in #75473 (#76758)

dotnet · Oct 7, 2022 · 0058c73 · 0058c73
1 parent 434e7f6
commit 0058c73
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 36 deletions.
diff --git a/eng/pipelines/runtime-android.yml b/eng/pipelines/runtime-android.yml
@@ -7,10 +7,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isAndroidOnlyBuild: ${{ variables.isAndroidOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isAndroidOnlyBuild: ${{ variables.isAndroidOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-androidemulator.yml b/eng/pipelines/runtime-androidemulator.yml
@@ -8,10 +8,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isAndroidEmulatorOnlyBuild: ${{ variables.isAndroidEmulatorOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isAndroidEmulatorOnlyBuild: ${{ variables.isAndroidEmulatorOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-ioslike.yml b/eng/pipelines/runtime-ioslike.yml
@@ -7,10 +7,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ variables.isiOSLikeOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isiOSLikeOnlyBuild: ${{ variables.isiOSLikeOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-ioslikesimulator.yml b/eng/pipelines/runtime-ioslikesimulator.yml
@@ -8,10 +8,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isiOSLikeSimulatorOnlyBuild: ${{ variables.isiOSLikeSimulatorOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isiOSLikeSimulatorOnlyBuild: ${{ variables.isiOSLikeSimulatorOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-linuxbionic.yml b/eng/pipelines/runtime-linuxbionic.yml
@@ -7,10 +7,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isLinuxBionicOnlyBuild: ${{ variables.isLinuxBionicOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isLinuxBionicOnlyBuild: ${{ variables.isLinuxBionicOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-maccatalyst.yml b/eng/pipelines/runtime-maccatalyst.yml
@@ -7,10 +7,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isMacCatalystOnlyBuild: ${{ variables.isMacCatalystOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isMacCatalystOnlyBuild: ${{ variables.isMacCatalystOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}