[ansible] make ansible 5.x the new default version (#8660)
* [ansible] make ansible 5.x the new default version and move different versions tested to nightly jobs * [CI] jobs were missing proper ansible cleanup
This commit is contained in:
parent
503ab0f722
commit
ef29455652
7 changed files with 17 additions and 18 deletions
|
@ -52,7 +52,7 @@ tox-inventory-builder:
|
||||||
- ./tests/scripts/rebase.sh
|
- ./tests/scripts/rebase.sh
|
||||||
- apt-get update && apt-get install -y python3-pip
|
- apt-get update && apt-get install -y python3-pip
|
||||||
- update-alternatives --install /usr/bin/python python /usr/bin/python3 10
|
- 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
|
- python -m pip install -r tests/requirements.txt
|
||||||
script:
|
script:
|
||||||
- pip3 install tox
|
- pip3 install tox
|
||||||
|
|
|
@ -31,31 +31,31 @@ packet_ubuntu20-calico-aio:
|
||||||
variables:
|
variables:
|
||||||
RESET_CHECK: "true"
|
RESET_CHECK: "true"
|
||||||
|
|
||||||
# Exericse ansible variants
|
# Exericse ansible variants during the nightly jobs
|
||||||
packet_ubuntu20-calico-aio-ansible-2_9:
|
packet_ubuntu20-calico-aio-ansible-2_9:
|
||||||
stage: deploy-part1
|
stage: deploy-part1
|
||||||
extends: .packet_pr
|
extends: .packet_periodic
|
||||||
when: on_success
|
when: on_success
|
||||||
variables:
|
variables:
|
||||||
ANSIBLE_MAJOR_VERSION: "2.9"
|
ANSIBLE_MAJOR_VERSION: "2.9"
|
||||||
RESET_CHECK: "true"
|
RESET_CHECK: "true"
|
||||||
|
|
||||||
|
packet_ubuntu20-calico-aio-ansible-2_10:
|
||||||
|
stage: deploy-part1
|
||||||
|
extends: .packet_periodic
|
||||||
|
when: on_success
|
||||||
|
variables:
|
||||||
|
ANSIBLE_MAJOR_VERSION: "2.10"
|
||||||
|
RESET_CHECK: "true"
|
||||||
|
|
||||||
packet_ubuntu20-calico-aio-ansible-2_11:
|
packet_ubuntu20-calico-aio-ansible-2_11:
|
||||||
stage: deploy-part1
|
stage: deploy-part1
|
||||||
extends: .packet_pr
|
extends: .packet_periodic
|
||||||
when: on_success
|
when: on_success
|
||||||
variables:
|
variables:
|
||||||
ANSIBLE_MAJOR_VERSION: "2.11"
|
ANSIBLE_MAJOR_VERSION: "2.11"
|
||||||
RESET_CHECK: "true"
|
RESET_CHECK: "true"
|
||||||
|
|
||||||
packet_ubuntu20-calico-aio-ansible-2_12:
|
|
||||||
stage: deploy-part1
|
|
||||||
extends: .packet_pr
|
|
||||||
when: on_success
|
|
||||||
variables:
|
|
||||||
ANSIBLE_MAJOR_VERSION: "2.12"
|
|
||||||
RESET_CHECK: "true"
|
|
||||||
|
|
||||||
# ### PR JOBS PART2
|
# ### PR JOBS PART2
|
||||||
|
|
||||||
packet_ubuntu18-aio-docker:
|
packet_ubuntu18-aio-docker:
|
||||||
|
|
|
@ -11,7 +11,7 @@ molecule_tests:
|
||||||
- tests/scripts/rebase.sh
|
- tests/scripts/rebase.sh
|
||||||
- apt-get update && apt-get install -y python3-pip
|
- apt-get update && apt-get install -y python3-pip
|
||||||
- update-alternatives --install /usr/bin/python python /usr/bin/python3 10
|
- 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
|
- python -m pip install -r tests/requirements.txt
|
||||||
- ./tests/scripts/vagrant_clean.sh
|
- ./tests/scripts/vagrant_clean.sh
|
||||||
script:
|
script:
|
||||||
|
@ -38,7 +38,7 @@ molecule_tests:
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update && apt-get install -y python3-pip
|
- apt-get update && apt-get install -y python3-pip
|
||||||
- update-alternatives --install /usr/bin/python python /usr/bin/python3 10
|
- 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
|
- python -m pip install -r tests/requirements.txt
|
||||||
- ./tests/scripts/vagrant_clean.sh
|
- ./tests/scripts/vagrant_clean.sh
|
||||||
script:
|
script:
|
||||||
|
|
|
@ -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.
|
You first need to uninstall your old ansible (pre 2.10) version and install the new one.
|
||||||
|
|
||||||
```ShellSession
|
```ShellSession
|
||||||
pip uninstall ansible
|
pip uninstall ansible ansible-base ansible-core
|
||||||
cd kubespray/
|
cd kubespray/
|
||||||
pip install -U .
|
pip install -U .
|
||||||
```
|
```
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
requirements-2.10.txt
|
requirements-2.12.txt
|
|
@ -1 +0,0 @@
|
||||||
packet_ubuntu20-calico-aio.yml
|
|
|
@ -1 +1 @@
|
||||||
requirements-2.10.txt
|
requirements-2.12.txt
|
Loading…
Reference in a new issue