fixup! upstream CI: Use start.sh script and environment template

rjeffman · Oct 15, 2024 · 55265bb · 55265bb
1 parent c042227
commit 55265bb
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 248 deletions.
diff --git a/infra/azure/azure-pipelines.yml b/infra/azure/azure-pipelines.yml
@@ -15,7 +15,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core"
       filter_tests: false
 
@@ -27,7 +27,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core <2.14"
       filter_tests: false
 
@@ -39,7 +39,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core >=2.14,<2.15"
       filter_tests: false
 
@@ -48,12 +48,13 @@ stages:
 - stage: Galaxy_Fedora_Latest
   dependsOn: []
   jobs:
-  - template: templates/galaxy_tests.yml
+  - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core >=2.14,<2.15"
       filter_tests: false
+      test_galaxy: true
 
 # CentOS 9 Stream
 
@@ -63,7 +64,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c9s
+      distro: c9s
       ansible_version: "-core >=2.14,<2.15"
       filter_tests: false
 
@@ -75,6 +76,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c8s
+      distro: c8s
       ansible_version: "-core >=2.14,<2.15"
+      target_python: "/usr/libexec/platform-python"
       filter_tests: false
diff --git a/infra/azure/nightly.yml b/infra/azure/nightly.yml
@@ -22,7 +22,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core >=2.13,<2.14"
       filter_tests: false
 
@@ -32,7 +32,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core >=2.14,<2.15"
       filter_tests: false
 
@@ -42,7 +42,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core >=2.15,<2.16"
       filter_tests: false
 
@@ -52,7 +52,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: ""
       filter_tests: false
 
@@ -61,42 +61,46 @@ stages:
 - stage: Galaxy_FedoraLatest_Ansible_Core_2_13
   dependsOn: []
   jobs:
-  - template: templates/galaxy_tests.yml
+  - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core >=2.13,<2.14"
       filter_tests: false
+      test_galaxy: ${{ parameters.test_galaxy }}
 
 - stage: Galaxy_FedoraLatest_Ansible_Core_2_14
   dependsOn: []
   jobs:
-  - template: templates/galaxy_tests.yml
+  - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core >=2.14,<2.15"
       filter_tests: false
+      test_galaxy: ${{ parameters.test_galaxy }}
 
 - stage: Galaxy_FedoraLatest_Ansible_Core_2_15
   dependsOn: []
   jobs:
-  - template: templates/galaxy_tests.yml
+  - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: "-core >=2.15,<2.16"
       filter_tests: false
+      test_galaxy: ${{ parameters.test_galaxy }}
 
 - stage: Galaxy_FedoraLatest_Ansible_latest
   dependsOn: []
   jobs:
-  - template: templates/galaxy_tests.yml
+  - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: ""
       filter_tests: false
+      test_galaxy: ${{ parameters.test_galaxy }}
 
 # Fedora Rawhide
 
@@ -106,7 +110,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-rawhide
+      distro: fedora-rawhide
       ansible_version: "-core >=2.13,<2.14"
       filter_tests: false
 
@@ -116,7 +120,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-rawhide
+      distro: fedora-rawhide
       ansible_version: "-core >=2.14,<2.15"
       filter_tests: false
 
@@ -126,7 +130,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-rawhide
+      distro: fedora-rawhide
       ansible_version: "-core >=2.15,<2.16"
       filter_tests: false
 
@@ -136,7 +140,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-rawhide
+      distro: fedora-rawhide
       ansible_version: ""
       filter_tests: false
 
@@ -148,7 +152,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c9s
+      distro: c9s
       ansible_version: "-core >=2.13,<2.14"
       filter_tests: false
 
@@ -158,7 +162,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c9s
+      distro: c9s
       ansible_version: "-core >=2.14,<2.15"
       filter_tests: false
 
@@ -168,7 +172,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c9s
+      distro: c9s
       ansible_version: "-core >=2.15,<2.16"
       filter_tests: false
 
@@ -178,7 +182,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c9s
+      distro: c9s
       ansible_version: ""
       filter_tests: false
 
@@ -190,8 +194,9 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c8s
+      distro: c8s
       ansible_version: "-core >=2.13,<2.14"
+      target_python: "/usr/libexec/platform-python"
       filter_tests: false
 
 - stage: c8s_Ansible_Core_2_14
@@ -200,8 +205,9 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c8s
+      distro: c8s
       ansible_version: "-core >=2.14,<2.15"
+      target_python: "/usr/libexec/platform-python"
       filter_tests: false
 
 - stage: c8s_Ansible_Core_2_15
@@ -210,8 +216,9 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c8s
+      distro: c8s
       ansible_version: "-core >=2.15,<2.16"
+      target_python: "/usr/libexec/platform-python"
       filter_tests: false
 
 - stage: c8s_Ansible_latest
@@ -220,6 +227,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c8s
+      distro: c8s
       ansible_version: ""
+      target_python: "/usr/libexec/platform-python"
       filter_tests: false
diff --git a/infra/azure/pr-pipeline.yml b/infra/azure/pr-pipeline.yml
@@ -12,7 +12,7 @@ stages:
 - stage: Fedora_Latest
   dependsOn: []
   jobs:
-  - template: templates/playbook_tests.yml
+  - template: templates/run_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-latest
@@ -24,19 +24,20 @@ stages:
 - stage: Galaxy_Fedora_Latest
   dependsOn: []
   jobs:
-  - template: templates/playbook_tests.yml
+  - template: templates/run_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-latest
       ansible_version: "-core >=2.15,<2.16"
       filter_tests: true
+      test_galaxy: true
 
 # CentOS 9 Stream
 
 - stage: CentOS_9_Stream
   dependsOn: []
   jobs:
-  - template: templates/playbook_tests.yml
+  - template: templates/run_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: c9s
@@ -48,20 +49,20 @@ stages:
 - stage: CentOS_8_Stream
   dependsOn: []
   jobs:
-  - template: templates/playbook_tests.yml
+  - template: templates/run_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: c8s
       ansible_version: "-core >=2.15,<2.16"
-      # target_python: "/usr/libexec/platform-python"
+      target_python: "/usr/libexec/platform-python"
       filter_tests: true
 
 # Rawhide
 
 - stage: Fedora_Rawhide
   dependsOn: []
   jobs:
-  - template: templates/playbook_tests.yml
+  - template: templates/run_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-rawhide

diff --git a/infra/azure/templates/galaxy_pytest_script.yml b/infra/azure/templates/galaxy_pytest_script.yml