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

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

Hide file tree

Showing 8 changed files with 97 additions and 154 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,21 +39,21 @@ 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
 
 # Galaxy on Fedora
 
-- stage: Galaxy_Fedora_Latest
-  dependsOn: []
-  jobs:
-  - template: templates/galaxy_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
-      ansible_version: "-core >=2.14,<2.15"
-      filter_tests: false
+#- stage: Galaxy_Fedora_Latest
+#  dependsOn: []
+#  jobs:
+#  - template: templates/galaxy_tests.yml
+#    parameters:
+#      build_number: $(Build.BuildNumber)
+#      distro: fedora-latest
+#      ansible_version: "-core >=2.14,<2.15"
+#      filter_tests: false
 
 # CentOS 9 Stream
 
@@ -63,7 +63,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 +75,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,51 +52,51 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
+      distro: fedora-latest
       ansible_version: ""
       filter_tests: false
 
 # Galaxy on Fedora
 
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_13
-  dependsOn: []
-  jobs:
-  - template: templates/galaxy_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
-      ansible_version: "-core >=2.13,<2.14"
-      filter_tests: false
-
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_14
-  dependsOn: []
-  jobs:
-  - template: templates/galaxy_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
-      ansible_version: "-core >=2.14,<2.15"
-      filter_tests: false
-
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_15
-  dependsOn: []
-  jobs:
-  - template: templates/galaxy_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
-      ansible_version: "-core >=2.15,<2.16"
-      filter_tests: false
-
-- stage: Galaxy_FedoraLatest_Ansible_latest
-  dependsOn: []
-  jobs:
-  - template: templates/galaxy_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: fedora-latest
-      ansible_version: ""
-      filter_tests: false
+#- stage: Galaxy_FedoraLatest_Ansible_Core_2_13
+#  dependsOn: []
+#  jobs:
+#  - template: templates/galaxy_tests.yml
+#    parameters:
+#      build_number: $(Build.BuildNumber)
+#      distro: fedora-latest
+#      ansible_version: "-core >=2.13,<2.14"
+#      filter_tests: false
+#
+#- stage: Galaxy_FedoraLatest_Ansible_Core_2_14
+#  dependsOn: []
+#  jobs:
+#  - template: templates/galaxy_tests.yml
+#    parameters:
+#      build_number: $(Build.BuildNumber)
+#      distro: fedora-latest
+#      ansible_version: "-core >=2.14,<2.15"
+#      filter_tests: false
+#
+#- stage: Galaxy_FedoraLatest_Ansible_Core_2_15
+#  dependsOn: []
+#  jobs:
+#  - template: templates/galaxy_tests.yml
+#    parameters:
+#      build_number: $(Build.BuildNumber)
+#      distro: fedora-latest
+#      ansible_version: "-core >=2.15,<2.16"
+#      filter_tests: false
+#
+#- stage: Galaxy_FedoraLatest_Ansible_latest
+#  dependsOn: []
+#  jobs:
+#  - template: templates/galaxy_tests.yml
+#    parameters:
+#      build_number: $(Build.BuildNumber)
+#      distro: fedora-latest
+#      ansible_version: ""
+#      filter_tests: false
 
 # Fedora Rawhide
 
@@ -106,7 +106,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 +116,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 +126,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 +136,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 +148,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 +158,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 +168,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 +178,7 @@ stages:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: c9s
+      distro: c9s
       ansible_version: ""
       filter_tests: false
 
@@ -190,8 +190,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 +201,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 +212,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 +223,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
@@ -53,7 +53,7 @@ stages:
       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

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