fixup! STILL NEED SOME WORK

rjeffman · Oct 30, 2024 · f129b1a · f129b1a
1 parent d01d85f
commit f129b1a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 30 deletions.
diff --git a/infra/azure/templates/group_tests.yml b/infra/azure/templates/group_tests.yml
@@ -14,40 +14,44 @@ parameters:
   - name: test_galaxy
     type: boolean
     default: false
+  - name: number_of_groups
+    type: int
+    default: 3
 
 jobs:
-- template: run_tests.yml
-  parameters:
-    group_number: 1
-    number_of_groups: 3
-    build_number: ${{ parameters.build_number }}
-    distro: ${{ parameters.distro }}
-    ansible_version: ${{ parameters.ansible_version }}
-    python_version: '< 3.12'
-    skip_git_test: ${{ parameters.skip_git_test }}
-    test_galaxy: ${{ parameters.test_galaxy }}
+- ${{ each group in range(1, parameters.number_of_groups }}:
+  - template: run_tests.yml
+    parameters:
+      group_number: ${{ group }}
+      number_of_groups: ${{ number_of_groups }}
+      build_number: ${{ parameters.build_number }}
+      distro: ${{ parameters.distro }}
+      ansible_version: ${{ parameters.ansible_version }}
+      python_version: '< 3.12'
+      skip_git_test: ${{ parameters.skip_git_test }}
+      test_galaxy: ${{ parameters.test_galaxy }}
 
-- template: run_tests.yml
-  parameters:
-    group_number: 2
-    number_of_groups: 3
-    build_number: ${{ parameters.build_number }}
-    distro: ${{ parameters.distro }}
-    ansible_version: ${{ parameters.ansible_version }}
-    python_version: '< 3.12'
-    skip_git_test: ${{ parameters.skip_git_test }}
-    test_galaxy: ${{ parameters.test_galaxy }}
+# - template: run_tests.yml
+#   parameters:
+#     group_number: 2
+#     number_of_groups: 3
+#     build_number: ${{ parameters.build_number }}
+#     distro: ${{ parameters.distro }}
+#     ansible_version: ${{ parameters.ansible_version }}
+#     python_version: '< 3.12'
+#     skip_git_test: ${{ parameters.skip_git_test }}
+#     test_galaxy: ${{ parameters.test_galaxy }}
 
-- template: run_tests.yml
-  parameters:
-    group_number: 3
-    number_of_groups: 3
-    build_number: ${{ parameters.build_number }}
-    distro: ${{ parameters.distro }}
-    ansible_version: ${{ parameters.ansible_version }}
-    python_version: '< 3.12'
-    skip_git_test: ${{ parameters.skip_git_test }}
-    test_galaxy: ${{ parameters.test_galaxy }}
+# - template: run_tests.yml
+#   parameters:
+#     group_number: 3
+#     number_of_groups: 3
+#     build_number: ${{ parameters.build_number }}
+#     distro: ${{ parameters.distro }}
+#     ansible_version: ${{ parameters.ansible_version }}
+#     python_version: '< 3.12'
+#     skip_git_test: ${{ parameters.skip_git_test }}
+#     test_galaxy: ${{ parameters.test_galaxy }}
 
 # Temporarily disabled due to ansible docker plugin issue.
 # - template: run_tests.yml

diff --git a/infra/azure/templates/run_tests.yml b/infra/azure/templates/run_tests.yml
@@ -42,6 +42,8 @@ jobs:
       ansible_version: ${{ parameters.ansible_version }}
       python_version: ${{ parameters.python_version }}
 
+  - bash: echo "##vso[task.setvariable variable=TOPDIR]${PWD}"
+
   - script: |
       . "${TOPDIR}/utils/set_test_modules"
       python3 utils/check_test_configuration.py ${{ parameters.distro }}