Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove failing part of self-test in release role #512

Merged
merged 3 commits into from
Apr 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/512-release-role-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +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)."
17 changes: 0 additions & 17 deletions playbooks/nested-ansible-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -52,18 +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
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"
changed_when: false
6 changes: 0 additions & 6 deletions roles/build-release/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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] }}"

Expand Down
19 changes: 0 additions & 19 deletions roles/build-release/meta/argument_specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,6 @@ argument_specs:
type: path
default: "{{ antsibull_data_git_dir }}/<major_version>"

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.
Expand Down
2 changes: 0 additions & 2 deletions roles/build-release/tasks/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
-e _python_version="{{ _python_version }}"
{{ playbook_dir }}/nested-ansible-tests.yaml