From 2987a7c3d2f75dab0fbb015afb9c4968028c3ae7 Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Thu, 31 Oct 2024 09:23:30 -0300
Subject: [PATCH] fixup! upstream CI: Simplify pipelines enviroment creation

---
 infra/azure/pr-pipeline.yml | 57 ++++++++-----------------------------
 1 file changed, 12 insertions(+), 45 deletions(-)

diff --git a/infra/azure/pr-pipeline.yml b/infra/azure/pr-pipeline.yml
index bc6e0830b8..6a095c1d78 100644
--- a/infra/azure/pr-pipeline.yml
+++ b/infra/azure/pr-pipeline.yml
@@ -5,19 +5,22 @@ trigger:
 pool:
   vmImage: 'ubuntu-20.04'
 
+variables: { distros: "fedora-latest,c9s,c8s,fedora-rawhide" }
+
 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
 
 # Galaxy on Fedora
 
@@ -31,39 +34,3 @@ stages:
       ansible_version: "-core >=2.15,<2.16"
       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