fixup! upstream CI: Simplify enviroment creation for image build

rjeffman · Oct 28, 2024 · 87a22d7 · 87a22d7
1 parent 38df1c3
commit 87a22d7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/infra/azure/nightly.yml b/infra/azure/nightly.yml
@@ -57,6 +57,7 @@ stages:
       distro: fedora-latest
       ansible_version: "-core >=2.17,<2.18"
       skip_git_test: true
+      test_galaxy: true
 
 # Fedora Rawhide
 

diff --git a/infra/azure/templates/run_tests.yml b/infra/azure/templates/run_tests.yml
@@ -45,23 +45,30 @@ jobs:
       ansible_version: ${{ parameters.ansible_version }}
       python_version: ${{ parameters.python_version }}
 
-  - script: |
-      git fetch --unshallow
-      utils/build-galaxy-release.sh -i
-    retryCountOnTaskFailure: 5
-    displayName: Build Galaxy release
-    condition: ${{ parameters.test_galaxy }}
+  - bash: echo "##vso[task.setvariable variable=TOPDIR]${PWD}"
 
   - script: |
-      . utils/set_test_modules
+      . "${TOPDIR}/utils/set_test_modules"
       python3 utils/check_test_configuration.py ${{ parameters.distro }}
     displayName: Check test configuration
     env:
        SKIP_GIT_TEST: ${{ parameters.skip_git_test }}
 
   - script: |
-      . utils/set_test_modules
-      [ "${{ parameters.test_galaxy }}" == "True" ] && cd ~/.ansible/collections/ansible_collections/freeipa/ansible_freeipa
+      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 }}
+
+  - script: |
+      echo "PWD: ${PWD}"
+      echo "TOPDIR: ${TOPDIR}"
+      echo "ROLES: ${ANSIBLE_ROLES_PATH}"
+      echo "LIBRARY: ${ANSIBLE_LIBRARY}"
+      echo "MODULE_UTILS: ${ANSIBLE_MODULE_UTILS}"
+      . "${TOPDIR}/utils/set_test_modules"
       pytest \
           -m "${{ parameters.test_type }}" \
           --verbose \