From 9c9a63cd9c8e15b3895696f45359c510f63b20b0 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Sun, 30 Jun 2024 14:53:35 +0000 Subject: [PATCH] FIXUP: Azure --- tests/azure/pr-pipeline.yml | 4 +++- tests/azure/templates/fast_tests.yml | 4 ++++ tests/azure/templates/playbook_fast.yml | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/azure/pr-pipeline.yml b/tests/azure/pr-pipeline.yml index 5f29591aae..11543ac79d 100644 --- a/tests/azure/pr-pipeline.yml +++ b/tests/azure/pr-pipeline.yml @@ -49,8 +49,9 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: c8s + ansible_version: "-core >=2.14,<2.15" # Python 3.8 does not work with ansible-core >=2.14.0 - ansible_version: "-core ==2.13.3" + #ansible_version: "-core ==2.13.3" # CentOS 7 @@ -62,6 +63,7 @@ stages: build_number: $(Build.BuildNumber) scenario: centos-7 ansible_version: "-core >=2.14,<2.15" + target_python: "/usr/bin/python2" # Rawhide diff --git a/tests/azure/templates/fast_tests.yml b/tests/azure/templates/fast_tests.yml index fdb1ea0d13..735088ddfa 100644 --- a/tests/azure/templates/fast_tests.yml +++ b/tests/azure/templates/fast_tests.yml @@ -8,6 +8,9 @@ parameters: - name: ansible_version type: string default: "" + - name: target_python + type: string + default: "/usr/bin/python3" jobs: - template: playbook_fast.yml @@ -18,6 +21,7 @@ jobs: scenario: ${{ parameters.scenario }} ansible_version: ${{ parameters.ansible_version }} python_version: '< 3.12' + target_python: ${{ parameters.target_python }} # - template: pytest_tests.yml # parameters: diff --git a/tests/azure/templates/playbook_fast.yml b/tests/azure/templates/playbook_fast.yml index 82ce52da74..7275d226f4 100644 --- a/tests/azure/templates/playbook_fast.yml +++ b/tests/azure/templates/playbook_fast.yml @@ -17,6 +17,9 @@ parameters: default: 3.x - name: build_number type: string + - name: target_python + type: string + default: "/usr/bin/python3" jobs: - job: Test_Group${{ parameters.group_number }} @@ -50,7 +53,7 @@ jobs: - script: | . utils/set_test_modules - utils/run-tests.sh -a -i ${{ parameters.scenario }} -c ${{ parameters.scenario }} + utils/run-tests.sh -a -p ${{ parameters.target_python }} -i ${{ parameters.scenario }} -c ${{ parameters.scenario }} displayName: Run playbook tests env: IPA_SERVER_HOST: ${{ parameters.scenario }}