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

rjeffman · Oct 15, 2024 · 1f58906 · 1f58906
1 parent 942d509
commit 1f58906
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 171 deletions.
diff --git a/infra/azure/templates/fast_tests.yml b/infra/azure/templates/fast_tests.yml
diff --git a/infra/azure/templates/galaxy_tests.yml b/infra/azure/templates/galaxy_tests.yml
@@ -37,10 +37,14 @@ jobs:
     ansible_version: ${{ parameters.ansible_version }}
     python_version: '< 3.12'
 
-# Temporarily disable due to issues with ansible docker plugin.
-#- template: galaxy_pytest_script.yml
-#  parameters:
-#    build_number: ${{ parameters.build_number }}
-#    scenario: ${{ parameters.scenario }}
-#    ansible_version: ${{ parameters.ansible_version }}
-#    python_version: '< 3.12'
+# Temporarily disabled due to ansible docker plugin issue.
+# - template: playbook_tests.yml
+#   parameters:
+#     group_number: 3
+#     number_of_groups: 3
+#     build_number: ${{ parameters.build_number }}
+#     scenario: ${{ parameters.scenario }}
+#     ansible_version: ${{ parameters.ansible_version }}
+#     python_version: '< 3.12'
+#     filter_tests: ${{ parameters.filter_tests }}
+#     test_type: "not playbook"
diff --git a/infra/azure/templates/group_tests.yml b/infra/azure/templates/group_tests.yml
@@ -44,9 +44,13 @@ jobs:
     filter_tests: ${{ parameters.filter_tests }}
 
 # Temporarily disabled due to ansible docker plugin issue.
-#- template: pytest_tests.yml
-#  parameters:
-#    build_number: ${{ parameters.build_number }}
-#    scenario: ${{ parameters.scenario }}
-#    ansible_version: ${{ parameters.ansible_version }}
-#    python_version: '< 3.12'
+# - template: playbook_tests.yml
+#   parameters:
+#     group_number: 3
+#     number_of_groups: 3
+#     build_number: ${{ parameters.build_number }}
+#     scenario: ${{ parameters.scenario }}
+#     ansible_version: ${{ parameters.ansible_version }}
+#     python_version: '< 3.12'
+#     filter_tests: ${{ parameters.filter_tests }}
+#     test_type: "not playbook"
diff --git a/infra/azure/templates/playbook_fast.yml b/infra/azure/templates/playbook_fast.yml
diff --git a/infra/azure/templates/playbook_tests.yml b/infra/azure/templates/playbook_tests.yml
@@ -38,9 +38,14 @@ jobs:
       distro: ${{ parameters.distro }}
       ansible_version: ${{ parameters.ansible_version }}
       python_version: ${{ parameters.python_version }}
-      filter_tests: ${{ parameters.filter_tests }}
 
   - script: |
+      [ "${{ parameters.filter_tests }}" == "True" ] &&  . utils/set_test_modules
+      python3 utils/check_test_configuration.py ${{ parameters.distro }}
+    displayName: Check test configuration
+
+  - script: |
+      [ "${{ parameters.filter_tests }}" == "True" ]  && . utils/set_test_modules
       pytest \
           -m "${{ parameters.test_type }}" \
           --verbose \

diff --git a/infra/azure/templates/prepare_environment.yaml b/infra/azure/templates/prepare_environment.yaml
@@ -11,9 +11,6 @@ parameters:
     default: 3.x
   - name: build_number
     type: string
-  - name: filter_tests
-    type: boolean
-    default: true
 
 steps:
   - task: UsePythonVersion@0
@@ -31,9 +28,3 @@ steps:
 
   - script: infra/image/start.sh ${{ parameters.distro }}-server
     displayName: Setup target container for ${{ parameters.distro }}
-
-  - script: . utils/set_test_modules
-    condition: ${{ eq(parameters.filter_tests, true) }}
-
-  - script: python3 utils/check_test_configuration.py ${{ parameters.distro }}
-    displayName: Check test configuration
diff --git a/infra/azure/templates/pytest_tests.yml b/infra/azure/templates/pytest_tests.yml