diff --git a/tests/azure/pr-pipeline.yml b/tests/azure/pr-pipeline.yml index 2345347db..a87cc7156 100644 --- a/tests/azure/pr-pipeline.yml +++ b/tests/azure/pr-pipeline.yml @@ -16,7 +16,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core" # Galaxy on Fedora @@ -27,7 +27,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core <2.16" # CentOS 9 Stream @@ -49,7 +49,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: c8s - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core" # CentOS 7 @@ -60,7 +60,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: centos-7 - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core" # Rawhide @@ -71,4 +71,4 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: fedora-rawhide - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core" diff --git a/tests/azure/templates/fast_tests.yml b/tests/azure/templates/fast_tests.yml index cde72a70c..51f5cd506 100644 --- a/tests/azure/templates/fast_tests.yml +++ b/tests/azure/templates/fast_tests.yml @@ -32,7 +32,7 @@ jobs: number_of_groups: 3 build_number: ${{ parameters.build_number }} scenario: ${{ parameters.scenario }} - ansible_version: ${{ parameters.ansible_version }}z + ansible_version: ${{ parameters.ansible_version }} # - template: pytest_tests.yml # parameters: diff --git a/tests/azure/templates/playbook_fast.yml b/tests/azure/templates/playbook_fast.yml index ce187a3cc..8fa8cd2de 100644 --- a/tests/azure/templates/playbook_fast.yml +++ b/tests/azure/templates/playbook_fast.yml @@ -46,17 +46,17 @@ jobs: retryCountOnTaskFailure: 5 displayName: Install dependencies - - script: | - rm -rf ~/ansible - mkdir -p ~/.ansible/roles ~/.ansible/library ~/.ansible/module_utils - cp -a roles/* ~/.ansible/roles - cp -a plugins/modules/* ~/.ansible/library - cp -a plugins/module_utils/* ~/.ansible/module_utils - molecule create -s ${{ parameters.scenario }} - retryCountOnTaskFailure: 5 - displayName: Setup test container - env: - ANSIBLE_LIBRARY: ./molecule +# - script: | +# rm -rf ~/ansible +# mkdir -p ~/.ansible/roles ~/.ansible/library ~/.ansible/module_utils +# cp -a roles/* ~/.ansible/roles +# cp -a plugins/modules/* ~/.ansible/library +# cp -a plugins/module_utils/* ~/.ansible/module_utils +# molecule create -s ${{ parameters.scenario }} +# retryCountOnTaskFailure: 5 +# displayName: Setup test container +# env: +# ANSIBLE_LIBRARY: ./molecule - script: | . utils/set_test_modules @@ -65,17 +65,18 @@ jobs: - script: | . utils/set_test_modules - if ! pytest \ - -m "playbook" \ - --verbose \ - --color=yes \ - --suppress-no-test-exit-code \ - --splits=${{ parameters.number_of_groups }} \ - --group=${{ parameters.group_number }} \ - --junit-xml=TEST-results-group-${{ parameters.group_number }}.xml - then - [ $? -eq 5 ] && true || false - fi + utils/run-tests.sh -s user +# if ! pytest \ +# -m "playbook" \ +# --verbose \ +# --color=yes \ +# --suppress-no-test-exit-code \ +# --splits=${{ parameters.number_of_groups }} \ +# --group=${{ parameters.group_number }} \ +# --junit-xml=TEST-results-group-${{ parameters.group_number }}.xml +# then +# [ $? -eq 5 ] && true || false +# fi displayName: Run playbook tests env: IPA_SERVER_HOST: ${{ parameters.scenario }}