From ac92ed1408e6150c60fd2ea34430194dd3bcf39e Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Wed, 15 Jun 2022 09:53:32 -0300
Subject: [PATCH] fixup! Add support to define which playbook tests to execute
with pytest.
---
tests/azure/templates/playbook_tests.yml | 8 ++++----
tests/azure/templates/pytest_tests.yml | 10 ++++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tests/azure/templates/playbook_tests.yml b/tests/azure/templates/playbook_tests.yml
index c838cbc3..3fb15ad3 100644
--- a/tests/azure/templates/playbook_tests.yml
+++ b/tests/azure/templates/playbook_tests.yml
@@ -64,10 +64,10 @@ jobs:
env:
IPA_SERVER_HOST: ${{ parameters.scenario }}
RUN_TESTS_IN_DOCKER: true
- IPA_DISABLED_MODULES: ${{ variables.disabled_modules }}
- IPA_DISABLED_TESTS: ${{ variables.disabled_tests }}
- IPA_ENABLED_MODULES: ${{ variables.enabled_modules }}
- IPA_ENABLED_TESTS: ${{ variables.enabled_tests }}
+ 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 }}
- task: PublishTestResults@2
inputs:
diff --git a/tests/azure/templates/pytest_tests.yml b/tests/azure/templates/pytest_tests.yml
index 48a8cb0f..f25ce2a7 100644
--- a/tests/azure/templates/pytest_tests.yml
+++ b/tests/azure/templates/pytest_tests.yml
@@ -16,6 +16,8 @@ jobs:
- job: Test_PyTests
displayName: Run pytests on ${{ parameters.scenario }}
timeoutInMinutes: 120
+ variables:
+ - template: variables.yaml
steps:
- task: UsePythonVersion@0
inputs:
@@ -53,10 +55,10 @@ jobs:
env:
IPA_SERVER_HOST: ${{ parameters.scenario }}
RUN_TESTS_IN_DOCKER: true
- IPA_DISABLED_MODULES: ${{ variables.disabled_modules }}
- IPA_DISABLED_TESTS: ${{ variables.disabled_tests }}
- IPA_ENABLED_MODULES: ${{ variables.enabled_modules }}
- IPA_ENABLED_TESTS: ${{ variables.enabled_tests }}
+ 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 }}
- task: PublishTestResults@2
inputs:
--
GitLab