From 84c1a20af73755328cf240c3d95f825bb8f2bed3 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 17 Feb 2022 22:29:50 +0100 Subject: [PATCH] CI: add community ansible-test images (#404) * Use community ansible-test images. * Adjust tests for new operating systems, and pass on Python version as well. * Fix Python version. Co-authored-by: David Moreau Simard * Fix package name. Co-authored-by: David Moreau Simard --- .azure-pipelines/azure-pipelines.yml | 17 +++++++++++++++++ .../targets/setup_openssl/vars/Archlinux.yml | 4 ++++ .../setup_pyopenssl/vars/Archlinux.yml | 3 +++ .../targets/setup_python_info/vars/main.yml | 6 ++++++ .../setup_ssh_keygen/vars/Archlinux.yml | 1 + tests/utils/shippable/linux-community.sh | 19 +++++++++++++++++++ 6 files changed, 50 insertions(+) create mode 100644 tests/integration/targets/setup_openssl/vars/Archlinux.yml create mode 100644 tests/integration/targets/setup_pyopenssl/vars/Archlinux.yml create mode 100644 tests/integration/targets/setup_ssh_keygen/vars/Archlinux.yml create mode 100755 tests/utils/shippable/linux-community.sh diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 97e07b56..adc8d96b 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -190,6 +190,22 @@ stages: - name: Ubuntu 18.04 test: ubuntu1804 +### Community Docker + - stage: Docker_community_devel + displayName: Docker (community images) devel + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: devel/linux-community/{0}/1 + targets: + - name: Debian Bullseye + test: debian-bullseye/3.9 + - name: ArchLinux + test: archlinux/3.10 + - name: CentOS Stream 8 + test: centos-stream8/3.8 + ### Remote - stage: Remote_devel displayName: Remote devel @@ -340,6 +356,7 @@ stages: - Docker_2_11 - Docker_2_10 - Docker_2_9 + - Docker_community_devel - Cloud_devel - Cloud_2_12 - Cloud_2_11 diff --git a/tests/integration/targets/setup_openssl/vars/Archlinux.yml b/tests/integration/targets/setup_openssl/vars/Archlinux.yml new file mode 100644 index 00000000..a12ed7e7 --- /dev/null +++ b/tests/integration/targets/setup_openssl/vars/Archlinux.yml @@ -0,0 +1,4 @@ +--- +openssl_package_name: openssl +cryptography_package_name: python-cryptography +cryptography_package_name_python3: python-cryptography diff --git a/tests/integration/targets/setup_pyopenssl/vars/Archlinux.yml b/tests/integration/targets/setup_pyopenssl/vars/Archlinux.yml new file mode 100644 index 00000000..5c70ed38 --- /dev/null +++ b/tests/integration/targets/setup_pyopenssl/vars/Archlinux.yml @@ -0,0 +1,3 @@ +--- +pyopenssl_package_name: python-pyopenssl +pyopenssl_package_name_python3: python-pyopenssl diff --git a/tests/integration/targets/setup_python_info/vars/main.yml b/tests/integration/targets/setup_python_info/vars/main.yml index 58ad6df7..db21cdba 100644 --- a/tests/integration/targets/setup_python_info/vars/main.yml +++ b/tests/integration/targets/setup_python_info/vars/main.yml @@ -52,6 +52,12 @@ system_python_version_data: '15': - '2.7' - '3.6' + Archlinux: + 'NA': + - '3.10' + Debian: + '11': + - '3.9' cannot_upgrade_cryptography: FreeBSD: diff --git a/tests/integration/targets/setup_ssh_keygen/vars/Archlinux.yml b/tests/integration/targets/setup_ssh_keygen/vars/Archlinux.yml new file mode 100644 index 00000000..4091fa7b --- /dev/null +++ b/tests/integration/targets/setup_ssh_keygen/vars/Archlinux.yml @@ -0,0 +1 @@ +openssh_client_package_name: openssh diff --git a/tests/utils/shippable/linux-community.sh b/tests/utils/shippable/linux-community.sh new file mode 100755 index 00000000..e68bdf38 --- /dev/null +++ b/tests/utils/shippable/linux-community.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -o pipefail -eux + +declare -a args +IFS='/:' read -ra args <<< "$1" + +image="${args[1]}" +python="${args[2]}" + +if [ "${#args[@]}" -gt 3 ]; then + target="shippable/posix/group${args[3]}/" +else + target="shippable/posix/" +fi + +# shellcheck disable=SC2086 +ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ + --docker "quay.io/ansible-community/test-image:${image}" --python "${python}"