From f57565f90aa548b500147e91b9434b37f22257d6 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 17 Apr 2023 06:52:12 +0200 Subject: [PATCH 1/3] Use ansible-test to run integration tests. --- playbooks/nested-ansible-tests.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/playbooks/nested-ansible-tests.yaml b/playbooks/nested-ansible-tests.yaml index 9a760910..c7082b8b 100644 --- a/playbooks/nested-ansible-tests.yaml +++ b/playbooks/nested-ansible-tests.yaml @@ -61,9 +61,6 @@ depth: 1 - name: Run a simple ad-hoc integration test - environment: - ANSIBLE_ROLES_PATH: "{{ antsibull_ansible_git_dir }}/test/integration/targets" - # Note: this didn't work prior to ansible-base 2.10.4: https://github.com/ansible/ansible/pull/71824 ansible.builtin.command: >- - {{ antsibull_ansible_venv }}/bin/ansible -vv localhost -m include_role -a "name=include_vars" + {{ antsibull_ansible_venv }}/bin/ansible-test integration -vv include_vars changed_when: false From 41d2435000f87da00abf01c1ccbb040b88bbad57 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 17 Apr 2023 21:27:45 +0200 Subject: [PATCH 2/3] Remove test that fails. --- changelogs/fragments/512-release-role-tests.yml | 2 ++ playbooks/nested-ansible-tests.yaml | 14 -------------- roles/build-release/tasks/tests.yaml | 2 -- 3 files changed, 2 insertions(+), 16 deletions(-) create mode 100644 changelogs/fragments/512-release-role-tests.yml diff --git a/changelogs/fragments/512-release-role-tests.yml b/changelogs/fragments/512-release-role-tests.yml new file mode 100644 index 00000000..3f971931 --- /dev/null +++ b/changelogs/fragments/512-release-role-tests.yml @@ -0,0 +1,2 @@ +minor_changes: + - "Remove now broken self-test from release role (https://github.com/ansible-community/antsibull/pull/512)." diff --git a/playbooks/nested-ansible-tests.yaml b/playbooks/nested-ansible-tests.yaml index c7082b8b..cfeaa4c0 100644 --- a/playbooks/nested-ansible-tests.yaml +++ b/playbooks/nested-ansible-tests.yaml @@ -11,8 +11,6 @@ # These can be supplied as extra-vars but are expected to come from roles/build-release/tasks/tests.yaml antsibull_sdist_dir: "{{ playbook_dir | dirname }}/build" antsibull_ansible_venv: "{{ antsibull_sdist_dir }}/venv" - antsibull_ansible_git_dir: "{{ antsibull_sdist_dir }}/ansible" - antsibull_ansible_git_version: "stable-2.12" _python_version: "python3.9" tasks: - name: Parse installed ansible_builtin_runtime @@ -52,15 +50,3 @@ - name: Print unavailable modules ansible.builtin.debug: msg: "The following modules are not available: {{ _unavailable_modules | map(attribute='item') | join(', ') }}" - - - name: Clone the ansible git repository - ansible.builtin.git: - repo: "https://github.com/ansible/ansible" - dest: "{{ antsibull_ansible_git_dir }}" - version: "{{ antsibull_ansible_git_version }}" - depth: 1 - - - name: Run a simple ad-hoc integration test - ansible.builtin.command: >- - {{ antsibull_ansible_venv }}/bin/ansible-test integration -vv include_vars - changed_when: false diff --git a/roles/build-release/tasks/tests.yaml b/roles/build-release/tasks/tests.yaml index 4277b3c7..2c3202b4 100644 --- a/roles/build-release/tasks/tests.yaml +++ b/roles/build-release/tasks/tests.yaml @@ -124,7 +124,5 @@ {{ antsibull_ansible_venv }}/bin/ansible-playbook -i 'localhost,' --connection=local -e antsibull_sdist_dir="{{ antsibull_sdist_dir }}" -e antsibull_ansible_venv="{{ antsibull_ansible_venv }}" - -e antsibull_ansible_git_dir="{{ antsibull_ansible_git_dir }}" - -e antsibull_ansible_git_version="{{ antsibull_ansible_git_version }}" -e _python_version="{{ _python_version }}" {{ playbook_dir }}/nested-ansible-tests.yaml From fbf3b4d1cf4ab987eeafaee602ef7f50f5c90abe Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 18 Apr 2023 07:46:02 +0200 Subject: [PATCH 3/3] Remove antsibull_ansible_git_repo, antsibull_ansible_git_version, antsibull_ansible_git_dir options. --- .../fragments/512-release-role-tests.yml | 1 + roles/build-release/defaults/main.yaml | 6 ------ roles/build-release/meta/argument_specs.yml | 19 ------------------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/changelogs/fragments/512-release-role-tests.yml b/changelogs/fragments/512-release-role-tests.yml index 3f971931..2bb26be9 100644 --- a/changelogs/fragments/512-release-role-tests.yml +++ b/changelogs/fragments/512-release-role-tests.yml @@ -1,2 +1,3 @@ minor_changes: - "Remove now broken self-test from release role (https://github.com/ansible-community/antsibull/pull/512)." + - "Remove the parameters ``antsibull_ansible_git_repo``, ``antsibull_ansible_git_version``, and ``antsibull_ansible_git_dir`` from release role (https://github.com/ansible-community/antsibull/pull/512)." diff --git a/roles/build-release/defaults/main.yaml b/roles/build-release/defaults/main.yaml index 0e4ec6ca..c7d1f0d6 100644 --- a/roles/build-release/defaults/main.yaml +++ b/roles/build-release/defaults/main.yaml @@ -32,12 +32,6 @@ antsibull_data_git_dir: "{{ antsibull_sdist_dir }}/ansible-build-data" # Directory to read .build and .deps files from antsibull_data_dir: "{{ antsibull_data_git_dir }}/{{ antsibull_ansible_major_version }}" -# Where to clone the Ansible git repo from so we can run integration tests -antsibull_ansible_git_repo: "https://github.com/ansible/ansible" - -# Where to clone the Ansible git repo -antsibull_ansible_git_dir: "{{ antsibull_sdist_dir }}/ansible" - # The major version of ansible to build antsibull_ansible_major_version: "{{ (antsibull_ansible_version | default('')).split('.', 1)[0] }}" diff --git a/roles/build-release/meta/argument_specs.yml b/roles/build-release/meta/argument_specs.yml index 6172a85f..0a60dd53 100644 --- a/roles/build-release/meta/argument_specs.yml +++ b/roles/build-release/meta/argument_specs.yml @@ -67,25 +67,6 @@ argument_specs: type: path default: "{{ antsibull_data_git_dir }}/" - antsibull_ansible_git_repo: - description: - - Where to clone the Ansible git repository from so we can run integration tests. - type: str - default: "https://github.com/ansible/ansible" - - antsibull_ansible_git_version: - description: - - The git tag (or branch) of the ansible repository to check out. - - Could be C(devel), C(stable-2.12), C(stable-2.13), etc. - type: str - required: true - - antsibull_ansible_git_dir: - description: - - Where to clone the Ansible git repository. - type: path - default: "{{ antsibull_sdist_dir }}/ansible" - antsibull_ansible_version: description: - The version of ansible to build.