fixup! start-scenario: Stop after creating compose

rjeffman · Feb 12, 2025 · 050da0d · 050da0d
1 parent 0f67c63
commit 050da0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/infra/azure/templates/run_tests.yml b/infra/azure/templates/run_tests.yml
@@ -53,25 +53,20 @@ jobs:
     env:
        SKIP_GIT_TEST: ${{ parameters.skip_git_test }}
 
+  # Deployment of IPA servers/clients is done through the collection
   - script: |
       git fetch --unshallow
       utils/build-galaxy-release.sh -i
     retryCountOnTaskFailure: 5
     displayName: Build Galaxy release
-    # condition: ${{ parameters.test_galaxy }}
 
   - script: cat infra/scenarios/ipa-ad-trust.yml
     displayName: Debug - Show configuration
 
   - script: |
-      echo "PWD: ${PWD}"
-      echo "TOPDIR: ${TOPDIR}"
-      echo "ROLES: ${ANSIBLE_ROLES_PATH}"
-      echo "LIBRARY: ${ANSIBLE_LIBRARY}"
-      echo "MODULE_UTILS: ${ANSIBLE_MODULE_UTILS}"
       # [ "${{ parameters.test_galaxy }}" == "True"  ] && cd ~/.ansible/collections/ansible_collections/freeipa/ansible_freeipa
       #
-      infra/scenarios/start-scenario -D
+      infra/scenarios/start-scenario -D infra/scenarios/ipa-ad-trust.yml
       # Give a chance for containers to be up
       sleep 5
       # workaround for 'sudo'
@@ -80,7 +75,7 @@ jobs:
       podman exec cli01 chmod u+r /etc/shadow
       # Deploy nodes
       ansible-playbook -i ansible-freeipa-scenario/inventory.yml ansible-freeipa-scenario/playbooks/deploy_*.yml ||:
-      ansible-playbook -i ansible-freeipa-scenario/inventory.yml ansible-freeipa-scenario/playbooks/install-cluster.yml
+      ansible-playbook -i ansible-freeipa-scenario/inventory.yml ansible-freeipa-scenario/playbooks/install-cluster.yml || exit 1
       ansible-playbook -i ansible-freeipa-scenario/inventory.yml ansible-freeipa-scenario/playbooks/config_*.yml ||:
       # Run tests
       infra/scenarios/run_test_scenario.sh -k
@@ -91,24 +86,8 @@ jobs:
         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 }}
       IPA_DISABLED_TESTS: ${{ variables.ipa_disabled_tests }}
       IPA_ENABLED_MODULES: ${{ variables.ipa_enabled_modules }}
       IPA_ENABLED_TESTS: ${{ variables.ipa_enabled_tests }}
       # IPA_VERBOSITY: "-vvv"
-
-  # - script: tar czf run_${{ parameters.build_number }}.tar.gz ansible-freeipa-scenarios
-  #   displayName: Collect configuarion and logs
-
-  # - task: PublishPipelineArtifacts@1
-  #   inputs:
-  #     targetPath: run_${{ parameters.build_number }}.tar.gz
-  #     artifactName: RunLogs
-
-  # - task: PublishTestResults@2
-  #   inputs:
-  #     mergeTestResults: true
-  #     testRunTitle: PlaybookTests-Build${{ parameters.build_number }}
-  #   condition: succeededOrFailed()
diff --git a/infra/scenarios/start-scenario b/infra/scenarios/start-scenario
@@ -68,7 +68,7 @@ ipalab-config ${distro:-} -o "${LABDIR}" "$(readlink -f "$SCENARIO")"
 cd "${LABDIR}"
 
 # Start compose
-[ "${COMPOSE:-"Y"}" == "Y" ] || exit 0
+[ "${COMPOSE:-"Y"}" == "N" ] || exit 0
 
 echo Starting compose
 podman-compose up -d || die "Could not create compose"