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

bump controller-node and aws over to fedora-37 nodes #1748

Merged
merged 3 commits into from
Jan 19, 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 playbooks/ansible-test-base-prepare-venv/pre.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
state: directory
path: /var/tmp/ansible-test-pip

- name: Update pip
shell: "~/venv/bin/pip install --upgrade pip"

- name: Install ansible into virtualenv
# TODO(pabelanger): Remove ANSIBLE_SKIP_CONFLICT_CHECK in the future.
environment:
Expand Down
5 changes: 4 additions & 1 deletion playbooks/ansible-test-base/pre.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
_selinux_package: selinux-please-lie-to-me
when:
- ansible_distribution == 'Fedora'
- ansible_test_python is version('3.9', '<=')
- ansible_test_python is version('3.10', '<=')

- name: Install selinux into virtualenv
shell: '~/venv/bin/pip install {{ _selinux_package }} "setuptools<50.0.0"'
Expand All @@ -70,6 +70,9 @@
- name: Install pytest-forked into virtualenv
shell: '~/venv/bin/pip install pytest-forked'

- name: Update pip
shell: "~/venv/bin/pip install --upgrade pip"

- name: Ensure pip temp directory exists in /var/tmp
file:
state: directory
Expand Down
2 changes: 1 addition & 1 deletion zuul.d/ansible-cloud-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
- name: github.com/ansible/ansible
- name: github.com/ansible-collections/amazon.aws
timeout: 3600
nodeset: fedora-35-1vcpu
nodeset: fedora-37-1vcpu
vars:
ansible_test_command: integration
ansible_test_python: 3.9
Expand Down
2 changes: 1 addition & 1 deletion zuul.d/nodesets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
name: controller-node
nodes:
- name: controller
label: ansible-fedora-35-1vcpu
label: ansible-fedora-37-1vcpu

- nodeset:
name: ansible-tox-linters
Expand Down