diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 69a453e7..6ac9db70 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -36,7 +36,7 @@ pool: Standard stages: ### Sanity - - stage: Ansible_devel + - stage: Sanity_devel displayName: Sanity devel dependsOn: [] jobs: @@ -44,9 +44,9 @@ stages: parameters: targets: - name: Sanity - test: "devel/sanity/1" + test: devel/sanity/1 - - stage: Ansible_2_16 + - stage: Sanity_2_16 displayName: Sanity 2.16 dependsOn: [] jobs: @@ -54,8 +54,9 @@ stages: parameters: targets: - name: Sanity - test: "2.16/sanity/1" - - stage: Ansible_2_15 + test: 2.16/sanity/1 + + - stage: Sanity_2_15 displayName: Sanity 2.15 dependsOn: [] jobs: @@ -63,8 +64,9 @@ stages: parameters: targets: - name: Sanity - test: "2.15/sanity/1" - - stage: Ansible_2_14 + test: 2.15/sanity/1 + + - stage: Sanity_2_14 displayName: Sanity 2.14 dependsOn: [] jobs: @@ -72,8 +74,9 @@ stages: parameters: targets: - name: Sanity - test: "2.14/sanity/1" - - stage: Ansible_2_13 + test: 2.14/sanity/1 + + - stage: Sanity_2_13 displayName: Sanity 2.13 dependsOn: [] jobs: @@ -81,92 +84,133 @@ stages: parameters: targets: - name: Sanity - test: "2.13/sanity/1" + test: 2.13/sanity/1 + + ### Units + - stage: Units_devel + displayName: Units devel + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + targets: + - name: (py3.10) + test: devel/units/3.10 + + - stage: Units_2_16 + displayName: Units 2.16 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + targets: + - name: (py3.10) + test: 2.16/units/3.10 + + - stage: Units_2_15 + displayName: Units 2.15 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + targets: + - name: (py3.9) + test: 2.15/units/3.9 + + - stage: Units_2_14 + displayName: Units 2.14 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + targets: + - name: (py3.9) + test: 2.14/units/3.9 + + - stage: Units_2_13 + displayName: Units 2.13 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + targets: + - name: (py3.8) + test: 2.13/units/3.8 - ## Integration tests (remote) - - stage: Hetzner_devel - displayName: Hetzner devel + ## Integration + - stage: Integration_devel + displayName: Integration devel dependsOn: [] jobs: - template: templates/matrix.yml parameters: - groups: - - 1 - - 2 - - 3 + groups: [1, 2, 3] targets: - - name: hcloud - test: "devel/hcloud/3.10" + - name: (py3.10) + test: devel/integration/3.10 - - stage: Hetzner_2_16 - displayName: Hetzner 2.16 + - stage: Integration_2_16 + displayName: Integration 2.16 dependsOn: [] jobs: - template: templates/matrix.yml parameters: - groups: - - 1 - - 2 - - 3 + groups: [1, 2, 3] targets: - - name: hcloud - test: "2.16/hcloud/3.10" + - name: (py3.10) + test: 2.16/integration/3.10 - - stage: Hetzner_2_15 - displayName: Hetzner 2.15 + - stage: Integration_2_15 + displayName: Integration 2.15 dependsOn: [] jobs: - template: templates/matrix.yml parameters: - groups: - - 1 - - 2 - - 3 + groups: [1, 2, 3] targets: - - name: hcloud - test: "2.15/hcloud/3.9" + - name: (py3.9) + test: 2.15/integration/3.9 - - stage: Hetzner_2_14 - displayName: Hetzner 2.14 + - stage: Integration_2_14 + displayName: Integration 2.14 dependsOn: [] jobs: - template: templates/matrix.yml parameters: - groups: - - 1 - - 2 - - 3 + groups: [1, 2, 3] targets: - - name: hcloud - test: "2.14/hcloud/3.9" + - name: (py3.9) + test: 2.14/integration/3.9 - - stage: Hetzner_2_13 - displayName: Hetzner 2.13 + - stage: Integration_2_13 + displayName: Integration 2.13 dependsOn: [] jobs: - template: templates/matrix.yml parameters: - groups: - - 1 - - 2 - - 3 + groups: [1, 2, 3] targets: - - name: hcloud - test: "2.13/hcloud/3.9" + - name: (py3.8) + test: 2.13/integration/3.8 ### Finally - stage: Summary condition: succeededOrFailed() dependsOn: - - Ansible_devel - - Ansible_2_16 - - Ansible_2_15 - - Ansible_2_14 - - Ansible_2_13 - - Hetzner_devel - - Hetzner_2_16 - - Hetzner_2_15 - - Hetzner_2_14 - - Hetzner_2_13 + - Sanity_devel + - Sanity_2_16 + - Sanity_2_15 + - Sanity_2_14 + - Sanity_2_13 + - Units_devel + - Units_2_16 + - Units_2_15 + - Units_2_14 + - Units_2_13 + - Integration_devel + - Integration_2_16 + - Integration_2_15 + - Integration_2_14 + - Integration_2_13 jobs: - template: templates/coverage.yml diff --git a/tests/integration/constraints.txt b/tests/constraints.txt similarity index 100% rename from tests/integration/constraints.txt rename to tests/constraints.txt diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt new file mode 100644 index 00000000..bc314c3c --- /dev/null +++ b/tests/unit/requirements.txt @@ -0,0 +1,2 @@ +python-dateutil +requests diff --git a/tests/utils/shippable/hcloud.sh b/tests/utils/shippable/integration.sh similarity index 100% rename from tests/utils/shippable/hcloud.sh rename to tests/utils/shippable/integration.sh diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 655341ba..aa423244 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -74,7 +74,7 @@ else fi # STAR: HACK install dependencies -retry pip install -r tests/integration/requirements.txt -c tests/integration/constraints.txt +retry pip install -r tests/integration/requirements.txt -c tests/constraints.txt retry ansible-galaxy -vvv collection install -r tests/requirements.yml retry pip install rstcheck diff --git a/tests/utils/shippable/units.sh b/tests/utils/shippable/units.sh new file mode 100755 index 00000000..37c87586 --- /dev/null +++ b/tests/utils/shippable/units.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set -o pipefail -eux + +declare -a args +IFS='/:' read -ra args <<< "$1" + +python_version="${args[1]}" + +ansible-test env --timeout 30 --color -v + +# shellcheck disable=SC2086 +ansible-test units --color -v \ + --docker default \ + --python "$python_version" \ + ${COVERAGE:+"$COVERAGE"} \ + ${CHANGED:+"$CHANGED"}