fixup! upstream CI: Simplify pipelines enviroment creation

rjeffman · Oct 31, 2024 · f2cb8c8 · f2cb8c8
1 parent 8f0594e
commit f2cb8c8
Showing 1 changed file with 57 additions and 44 deletions.
diff --git a/infra/azure/pr-pipeline.yml b/infra/azure/pr-pipeline.yml
@@ -5,19 +5,32 @@ trigger:
 pool:
   vmImage: 'ubuntu-20.04'
 
+variables: { distros: "fedora-latest,c9s" }
+
 stages:
 
 # Fedora
 
-- stage: Fedora_Latest
-  dependsOn: []
-  jobs:
-  - template: templates/run_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: fedora-latest
-      ansible_version: "-core >=2.15,<2.16"
-      skip_git_test: false
+- ${{ each distro in split(variables.distros, ',') }}:
+  - stage: ${{ join(split(distro, '-'), '_') }}_ansible_core_2_15
+    dependsOn: []
+    jobs:
+    - template: templates/run_tests.yml
+      parameters:
+        build_number: $(Build.BuildNumber)
+        distro: ${{ distro }}
+        ansible_version: "-core >=2.15,<2.16"
+        skip_git_test: false
+
+# - stage: Fedora_Latest
+#   dependsOn: []
+#   jobs:
+#   - template: templates/run_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       distro: fedora-latest
+#       ansible_version: "-core >=2.15,<2.16"
+#       skip_git_test: false
 
 # Galaxy on Fedora
 
@@ -32,38 +45,38 @@ stages:
       skip_git_test: false
       test_galaxy: true
 
-# CentOS 9 Stream
-
-- stage: CentOS_9_Stream
-  dependsOn: []
-  jobs:
-  - template: templates/run_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: c9s
-      ansible_version: "-core >=2.15,<2.16"
-      skip_git_test: false
-
-# CentOS 8 Stream
-
-- stage: CentOS_8_Stream
-  dependsOn: []
-  jobs:
-  - template: templates/run_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: c8s
-      ansible_version: "-core >=2.15,<2.16"
-      skip_git_test: false
-
-# Rawhide
-
-- stage: Fedora_Rawhide
-  dependsOn: []
-  jobs:
-  - template: templates/run_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: fedora-rawhide
-      ansible_version: "-core >=2.15,<2.16"
-      skip_git_test: false
+# # CentOS 9 Stream
+# 
+# - stage: CentOS_9_Stream
+#   dependsOn: []
+#   jobs:
+#   - template: templates/run_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       distro: c9s
+#       ansible_version: "-core >=2.15,<2.16"
+#       skip_git_test: false
+# 
+# # CentOS 8 Stream
+# 
+# - stage: CentOS_8_Stream
+#   dependsOn: []
+#   jobs:
+#   - template: templates/run_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       distro: c8s
+#       ansible_version: "-core >=2.15,<2.16"
+#       skip_git_test: false
+# 
+# # Rawhide
+# 
+# - stage: Fedora_Rawhide
+#   dependsOn: []
+#   jobs:
+#   - template: templates/run_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       distro: fedora-rawhide
+#       ansible_version: "-core >=2.15,<2.16"
+#       skip_git_test: false