Skip to content

Commit

Permalink
[ansible] make ansible 5.x the new default version (kubernetes-sigs#8660
Browse files Browse the repository at this point in the history
)

* [ansible] make ansible 5.x the new default version and move different versions tested to nightly jobs

* [CI] jobs were missing proper ansible cleanup
  • Loading branch information
cristicalin authored and LuckySB committed Jun 29, 2023
1 parent aba1f5f commit 2edafca
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ tox-inventory-builder:
- ./tests/scripts/rebase.sh
- apt-get update && apt-get install -y python3-pip
- update-alternatives --install /usr/bin/python python /usr/bin/python3 10
- python -m pip uninstall -y ansible
- python -m pip uninstall -y ansible ansible-base ansible-core
- python -m pip install -r tests/requirements.txt
script:
- pip3 install tox
Expand Down
16 changes: 8 additions & 8 deletions .gitlab-ci/packet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@ packet_ubuntu20-calico-aio:
variables:
RESET_CHECK: "true"

# Exericse ansible variants
# Exericse ansible variants during the nightly jobs
packet_ubuntu20-calico-aio-ansible-2_9:
stage: deploy-part1
extends: .packet_pr
extends: .packet_periodic
when: on_success
variables:
ANSIBLE_MAJOR_VERSION: "2.9"
RESET_CHECK: "true"

packet_ubuntu20-calico-aio-ansible-2_11:
packet_ubuntu20-calico-aio-ansible-2_10:
stage: deploy-part1
extends: .packet_pr
extends: .packet_periodic
when: on_success
variables:
ANSIBLE_MAJOR_VERSION: "2.11"
ANSIBLE_MAJOR_VERSION: "2.10"
RESET_CHECK: "true"

packet_ubuntu20-calico-aio-ansible-2_12:
packet_ubuntu20-calico-aio-ansible-2_11:
stage: deploy-part1
extends: .packet_pr
extends: .packet_periodic
when: on_success
variables:
ANSIBLE_MAJOR_VERSION: "2.12"
ANSIBLE_MAJOR_VERSION: "2.11"
RESET_CHECK: "true"

# ### PR JOBS PART2
Expand Down
4 changes: 2 additions & 2 deletions .gitlab-ci/vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ molecule_tests:
- tests/scripts/rebase.sh
- apt-get update && apt-get install -y python3-pip
- update-alternatives --install /usr/bin/python python /usr/bin/python3 10
- python -m pip uninstall -y ansible
- python -m pip uninstall -y ansible ansible-base ansible-core
- python -m pip install -r tests/requirements.txt
- ./tests/scripts/vagrant_clean.sh
script:
Expand All @@ -38,7 +38,7 @@ molecule_tests:
before_script:
- apt-get update && apt-get install -y python3-pip
- update-alternatives --install /usr/bin/python python /usr/bin/python3 10
- python -m pip uninstall -y ansible
- python -m pip uninstall -y ansible ansible-base ansible-core
- python -m pip install -r tests/requirements.txt
- ./tests/scripts/vagrant_clean.sh
script:
Expand Down
2 changes: 1 addition & 1 deletion docs/ansible.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ that explains in detail the need and the evolution plan.
You first need to uninstall your old ansible (pre 2.10) version and install the new one.

```ShellSession
pip uninstall ansible
pip uninstall ansible ansible-base ansible-core
cd kubespray/
pip install -U .
```
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
1 change: 0 additions & 1 deletion tests/files/packet_ubuntu20-calico-aio-ansible-2_12.yml

This file was deleted.

2 changes: 1 addition & 1 deletion tests/requirements.txt

0 comments on commit 2edafca

Please sign in to comment.