diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index a85cf52f..f710e581 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -58,15 +58,15 @@ stages: - template: templates/matrix.yml parameters: targets: - - name: rhel/9.7 + azp/1/ + - name: RHEL 9.7 + group 1 test: ansible-test-integration-2.18-rhel-9.7-azp-1 - - name: rhel/9.7 + azp/2/ + - name: RHEL 9.7 + group 2 test: ansible-test-integration-2.18-rhel-9.7-azp-2 - - name: rhel/9.7 + azp/3/ + - name: RHEL 9.7 + group 3 test: ansible-test-integration-2.18-rhel-9.7-azp-3 - - name: rhel/9.7 + azp/4/ + - name: RHEL 9.7 + group 4 test: ansible-test-integration-2.18-rhel-9.7-azp-4 - - name: rhel/9.7 + azp/5/ + - name: RHEL 9.7 + group 5 test: ansible-test-integration-2.18-rhel-9.7-azp-5 - stage: remote_2_19 @@ -78,15 +78,15 @@ stages: - template: templates/matrix.yml parameters: targets: - - name: ubuntu/22.04 + azp/1/ + - name: Ubuntu 22.04 + group 1 test: ansible-test-integration-2.19-ubuntu-22.04-azp-1 - - name: ubuntu/22.04 + azp/2/ + - name: Ubuntu 22.04 + group 2 test: ansible-test-integration-2.19-ubuntu-22.04-azp-2 - - name: ubuntu/22.04 + azp/3/ + - name: Ubuntu 22.04 + group 3 test: ansible-test-integration-2.19-ubuntu-22.04-azp-3 - - name: ubuntu/22.04 + azp/4/ + - name: Ubuntu 22.04 + group 4 test: ansible-test-integration-2.19-ubuntu-22.04-azp-4 - - name: ubuntu/22.04 + azp/5/ + - name: Ubuntu 22.04 + group 5 test: ansible-test-integration-2.19-ubuntu-22.04-azp-5 - stage: remote_2_20 @@ -98,15 +98,15 @@ stages: - template: templates/matrix.yml parameters: targets: - - name: rhel/9.7 + azp/1/ + - name: RHEL 9.7 + group 1 test: ansible-test-integration-2.20-rhel-9.7-azp-1 - - name: rhel/9.7 + azp/2/ + - name: RHEL 9.7 + group 2 test: ansible-test-integration-2.20-rhel-9.7-azp-2 - - name: rhel/9.7 + azp/3/ + - name: RHEL 9.7 + group 3 test: ansible-test-integration-2.20-rhel-9.7-azp-3 - - name: rhel/9.7 + azp/4/ + - name: RHEL 9.7 + group 4 test: ansible-test-integration-2.20-rhel-9.7-azp-4 - - name: rhel/9.7 + azp/5/ + - name: RHEL 9.7 + group 5 test: ansible-test-integration-2.20-rhel-9.7-azp-5 - stage: remote_2_21 @@ -118,15 +118,15 @@ stages: - template: templates/matrix.yml parameters: targets: - - name: rhel/10.1 + azp/1/ + - name: RHEL 10.1 + group 1 test: ansible-test-integration-2.21-rhel-10.1-azp-1 - - name: rhel/10.1 + azp/2/ + - name: RHEL 10.1 + group 2 test: ansible-test-integration-2.21-rhel-10.1-azp-2 - - name: rhel/10.1 + azp/3/ + - name: RHEL 10.1 + group 3 test: ansible-test-integration-2.21-rhel-10.1-azp-3 - - name: rhel/10.1 + azp/4/ + - name: RHEL 10.1 + group 4 test: ansible-test-integration-2.21-rhel-10.1-azp-4 - - name: rhel/10.1 + azp/5/ + - name: RHEL 10.1 + group 5 test: ansible-test-integration-2.21-rhel-10.1-azp-5 - stage: remote_devel @@ -138,25 +138,25 @@ stages: - template: templates/matrix.yml parameters: targets: - - name: rhel/10.1 + azp/1/ + sdk-dev-latest + - name: RHEL 10.1 + group 1 + sdk-dev-latest test: ansible-test-integration-devel-rhel-10.1-azp-1 - - name: rhel/10.1 + azp/2/ + sdk-dev-latest + - name: RHEL 10.1 + group 2 + sdk-dev-latest test: ansible-test-integration-devel-rhel-10.1-azp-2 - - name: rhel/10.1 + azp/3/ + sdk-dev-latest + - name: RHEL 10.1 + group 3 + sdk-dev-latest test: ansible-test-integration-devel-rhel-10.1-azp-3 - - name: rhel/10.1 + azp/4/ + sdk-dev-latest + - name: RHEL 10.1 + group 4 + sdk-dev-latest test: ansible-test-integration-devel-rhel-10.1-azp-4 - - name: rhel/10.1 + azp/5/ + sdk-dev-latest + - name: RHEL 10.1 + group 5 + sdk-dev-latest test: ansible-test-integration-devel-rhel-10.1-azp-5 - - name: rhel/9.7 + azp/1/ + - name: RHEL 9.7 + group 1 test: ansible-test-integration-devel-rhel-9.7-azp-1 - - name: rhel/9.7 + azp/2/ + - name: RHEL 9.7 + group 2 test: ansible-test-integration-devel-rhel-9.7-azp-2 - - name: rhel/9.7 + azp/3/ + - name: RHEL 9.7 + group 3 test: ansible-test-integration-devel-rhel-9.7-azp-3 - - name: rhel/9.7 + azp/4/ + - name: RHEL 9.7 + group 4 test: ansible-test-integration-devel-rhel-9.7-azp-4 - - name: rhel/9.7 + azp/5/ + - name: RHEL 9.7 + group 5 test: ansible-test-integration-devel-rhel-9.7-azp-5 - stage: Summary diff --git a/.azure-pipelines/templates/test.yml b/.azure-pipelines/templates/test.yml index b263379c..897b5910 100644 --- a/.azure-pipelines/templates/test.yml +++ b/.azure-pipelines/templates/test.yml @@ -28,9 +28,9 @@ jobs: - bash: .azure-pipelines/scripts/process-results.sh condition: succeededOrFailed() displayName: Process Results - - bash: .azure-pipelines/scripts/aggregate-coverage.sh "$(Agent.TempDirectory)" - condition: eq(variables.haveCoverageData, 'true') - displayName: Aggregate Coverage Data + # - bash: .azure-pipelines/scripts/aggregate-coverage.sh "$(Agent.TempDirectory)" + # condition: eq(variables.haveCoverageData, 'true') + # displayName: Aggregate Coverage Data - task: PublishTestResults@2 condition: eq(variables.haveTestResults, 'true') inputs: diff --git a/antsibull-nox.toml b/antsibull-nox.toml index 68ba666a..b6c8157c 100644 --- a/antsibull-nox.toml +++ b/antsibull-nox.toml @@ -103,14 +103,27 @@ include_devel = true [sessions.ansible_test_integration] session_name_template = "ansible-test-integration-{ansible_core}{dash_docker_short}{dash_remote}{dash_python_version}{dash_target_dashized}" -display_name_template = "Ⓐ{ansible_core}{plus_docker_short}{plus_remote}{plus_py_python_version}{plus_target}{plus_force_docker_sdk_for_python_dev}{plus_force_docker_sdk_for_python_pypi}" -description_template = "Run integration tests with ansible-core {ansible_core}{comma_docker_short}{comma_remote}{comma_py_python_version}{comma_target}{comma_force_docker_sdk_for_python_dev}{comma_force_docker_sdk_for_python_pypi}" +display_name_template = "Ⓐ{ansible_core}{plus_docker_nice}{plus_remote_nice}{plus_py_python_version}{plus_target_nice}{plus_force_docker_sdk_for_python_dev}{plus_force_docker_sdk_for_python_pypi}" +description_template = "Run integration tests with ansible-core {ansible_core}{comma_docker_nice}{comma_remote_nice}{comma_py_python_version}{comma_target_nice}{comma_force_docker_sdk_for_python_dev}{comma_force_docker_sdk_for_python_pypi}" retry_on_error = "in-ci" [sessions.ansible_test_integration.ansible_vars] force_docker_sdk_for_python_dev = { type = "value", value = false, template_value = "" } force_docker_sdk_for_python_pypi = { type = "value", value = false, template_value = "" } +[sessions.ansible_test_integration.nice_target_names] +"azp/1/" = "group 1" +"azp/2/" = "group 2" +"azp/3/" = "group 3" +"azp/4/" = "group 4" +"azp/5/" = "group 5" + +[sessions.ansible_test_integration.nice_docker_names] +"quay.io/ansible-community/test-image:debian-bullseye" = "Debian 11" +"quay.io/ansible-community/test-image:debian-bookworm" = "Debian 12" +"quay.io/ansible-community/test-image:debian-13-trixie" = "Debian 13" +"quay.io/ansible-community/test-image:archlinux" = "Arch Linux" + ################################################################################################## # Ansible-core 2.17: