Skip to content
Snippets Groups Projects
Unverified Commit 1955943d authored by Luke Simmons's avatar Luke Simmons Committed by GitHub
Browse files

Removes Ansible reinstall from pipeline (#10032)

parent 3b68d636
No related branches found
No related tags found
No related merge requests found
...@@ -39,10 +39,6 @@ variables: ...@@ -39,10 +39,6 @@ variables:
before_script: before_script:
- ./tests/scripts/rebase.sh - ./tests/scripts/rebase.sh
- update-alternatives --install /usr/bin/python python /usr/bin/python3 1
- python -m pip uninstall -y ansible ansible-base ansible-core
- python -m pip install -r tests/requirements.txt
- ansible-galaxy install -r tests/requirements.yml
- mkdir -p /.ssh - mkdir -p /.ssh
.job: &job .job: &job
......
...@@ -67,11 +67,6 @@ tox-inventory-builder: ...@@ -67,11 +67,6 @@ tox-inventory-builder:
extends: .job extends: .job
before_script: before_script:
- ./tests/scripts/rebase.sh - ./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 ansible-base ansible-core
- python -m pip install -r tests/requirements.txt
- ansible-galaxy install -r tests/requirements.yml
script: script:
- pip3 install tox - pip3 install tox
- cd contrib/inventory_builder && tox - cd contrib/inventory_builder && tox
......
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
stage: deploy-part1 stage: deploy-part1
before_script: before_script:
- tests/scripts/rebase.sh - 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 ansible-base ansible-core
- python -m pip install -r tests/requirements.txt
- ansible-galaxy install -r tests/requirements.yml
- ./tests/scripts/vagrant_clean.sh - ./tests/scripts/vagrant_clean.sh
script: script:
- ./tests/scripts/molecule_run.sh - ./tests/scripts/molecule_run.sh
......
...@@ -13,11 +13,6 @@ ...@@ -13,11 +13,6 @@
image: $PIPELINE_IMAGE image: $PIPELINE_IMAGE
services: [] services: []
before_script: 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 ansible-base ansible-core
- python -m pip install -r tests/requirements.txt
- ansible-galaxy install -r tests/requirements.yml
- ./tests/scripts/vagrant_clean.sh - ./tests/scripts/vagrant_clean.sh
script: script:
- ./tests/scripts/testcases_run.sh - ./tests/scripts/testcases_run.sh
......
...@@ -29,6 +29,7 @@ RUN apt update -q \ ...@@ -29,6 +29,7 @@ RUN apt update -q \
gnupg2 \ gnupg2 \
software-properties-common \ software-properties-common \
unzip \ unzip \
libvirt-clients \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
&& add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ && add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
&& apt update -q \ && apt update -q \
......
ansible==7.6.0 ansible==7.6.0
ansible-core==2.14.6
cryptography==41.0.1 cryptography==41.0.1
jinja2==3.1.2 jinja2==3.1.2
jmespath==1.0.1 jmespath==1.0.1
......
#!/bin/bash #!/bin/bash
set -euxo pipefail set -euxo pipefail
/usr/bin/python -m pip uninstall -y ansible ansible-base ansible-core
/usr/bin/python -m pip install -r tests/requirements.txt
ansible-galaxy install -r tests/requirements.yml
mkdir -p /.ssh mkdir -p /.ssh
mkdir -p cluster-dump mkdir -p cluster-dump
mkdir -p $HOME/.ssh mkdir -p $HOME/.ssh
......
...@@ -3,8 +3,6 @@ set -euxo pipefail ...@@ -3,8 +3,6 @@ set -euxo pipefail
# Cleanup vagrant VMs to avoid name conflicts # Cleanup vagrant VMs to avoid name conflicts
apt-get install -y libvirt-clients
for i in $(virsh list --name) for i in $(virsh list --name)
do do
virsh destroy "$i" virsh destroy "$i"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment