fixup! STILL NEED SOME WORK

rjeffman · Oct 30, 2024 · 73aab02 · 73aab02
1 parent cada6d1
commit 73aab02
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/infra/azure/templates/run_tests.yml b/infra/azure/templates/run_tests.yml
@@ -42,8 +42,6 @@ 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 }}
@@ -54,7 +52,6 @@ jobs:
   - script: |
       git fetch --unshallow
       utils/build-galaxy-release.sh -i
-      cd ~/.ansible/collections/ansible_collections/freeipa/ansible_freeipa
     retryCountOnTaskFailure: 5
     displayName: Build Galaxy release
     condition: ${{ parameters.test_galaxy }}
@@ -66,6 +63,7 @@ jobs:
       echo "LIBRARY: ${ANSIBLE_LIBRARY}"
       echo "MODULE_UTILS: ${ANSIBLE_MODULE_UTILS}"
       . "${TOPDIR}/utils/set_test_modules"
+      [ "${{ parameters.test_galaxy }}" == "True"  ] && cd ~/.ansible/collections/ansible_collections/freeipa/ansible_freeipa
       pytest \
           -m "${{ parameters.test_type }}" \
           --verbose \
@@ -78,9 +76,10 @@ jobs:
     displayName: Run playbook tests
     env:
       SKIP_GIT_TEST: ${{ parameters.skip_git_test }}
-      ANSIBLE_ROLES_PATH: "${PWD}/roles"
-      ANSIBLE_LIBRARY: "${PWD}/plugins"
-      ANSIBLE_MODULE_UTILS: "${PWD}/plugins/module_utils"
+      ${{ if eq(${{parameters.test_galaxy }}, False)  }}:
+        ANSIBLE_ROLES_PATH: "${PWD}/roles"
+        ANSIBLE_LIBRARY: "${PWD}/plugins"
+        ANSIBLE_MODULE_UTILS: "${PWD}/plugins/module_utils"
       IPA_SERVER_HOST: ansible-freeipa-tests
       RUN_TESTS_IN_DOCKER: podman
       IPA_DISABLED_MODULES: ${{ variables.ipa_disabled_modules }}