From 04b9528ad52ad3d1002b8e5ec72ff46c9a67ad26 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 15 Oct 2024 12:24:40 -0300 Subject: [PATCH] fixup! upstream CI: Use start.sh script and environment template --- infra/azure/templates/playbook_tests.yml | 7 ++++++- infra/azure/templates/prepare_environment.yaml | 9 --------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/infra/azure/templates/playbook_tests.yml b/infra/azure/templates/playbook_tests.yml index 1beb8328ea..1ef76d956f 100644 --- a/infra/azure/templates/playbook_tests.yml +++ b/infra/azure/templates/playbook_tests.yml @@ -38,9 +38,14 @@ jobs: distro: ${{ parameters.distro }} ansible_version: ${{ parameters.ansible_version }} python_version: ${{ parameters.python_version }} - filter_tests: ${{ parameters.filter_tests }} - script: | + [ "${{ parameters.filter_tests }}" == "true" ] && . utils/set_test_modules + python3 utils/check_test_configuration.py ${{ parameters.distro }} + displayName: Check test configuration + + - script: | + [ "${{ parameters.filter_tests }}" == "true" ] && . utils/set_test_modules pytest \ -m "${{ parameters.test_type }}" \ --verbose \ diff --git a/infra/azure/templates/prepare_environment.yaml b/infra/azure/templates/prepare_environment.yaml index 58e06a8a97..077d40528e 100644 --- a/infra/azure/templates/prepare_environment.yaml +++ b/infra/azure/templates/prepare_environment.yaml @@ -11,9 +11,6 @@ parameters: default: 3.x - name: build_number type: string - - name: filter_tests - type: boolean - default: true steps: - task: UsePythonVersion@0 @@ -31,9 +28,3 @@ steps: - script: infra/image/start.sh ${{ parameters.distro }}-server displayName: Setup target container for ${{ parameters.distro }} - - - script: . utils/set_test_modules - condition: ${{ eq(parameters.filter_tests, true) }} - - - script: python3 utils/check_test_configuration.py ${{ parameters.distro }} - displayName: Check test configuration