diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80c5d7b012..9205b757d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -275,7 +275,7 @@ jobs: python-version: '3.12' - name: Upgrade ansible-core - run: python3 -m pip install --upgrade ansible-core + run: python3 -m pip install --upgrade "ansible-core<2.19" - name: Download coverage artifacts uses: actions/download-artifact@v4 diff --git a/Makefile b/Makefile index a94d45607d..7cfdcdad6e 100644 --- a/Makefile +++ b/Makefile @@ -371,7 +371,7 @@ test_collection: if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi && \ - if ! [ -x "$(shell command -v ansible-playbook)" ]; then pip install ansible-core; fi + if ! [ -x "$(shell command -v ansible-playbook)" ]; then pip install "ansible-core<2.19"; fi ansible --version py.test $(COLLECTION_TEST_DIRS) -v # The python path needs to be modified so that the tests can find Ansible within the container @@ -405,7 +405,7 @@ install_collection: build_collection test_collection_sanity: rm -rf awx_collection_build/ rm -rf $(COLLECTION_INSTALL) - if ! [ -x "$(shell command -v ansible-test)" ]; then pip install ansible-core; fi + if ! [ -x "$(shell command -v ansible-test)" ]; then pip install "ansible-core<2.19"; fi ansible --version COLLECTION_VERSION=1.0.0 $(MAKE) install_collection cd $(COLLECTION_INSTALL) && ansible-test sanity $(COLLECTION_SANITY_ARGS)