diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b805e2961e..fb1e8787260 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,9 +39,6 @@ variables: before_script: - ./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 - mkdir -p /.ssh .job: &job diff --git a/.gitlab-ci/molecule.yml b/.gitlab-ci/molecule.yml index 736c0ffd755..071e29bc69a 100644 --- a/.gitlab-ci/molecule.yml +++ b/.gitlab-ci/molecule.yml @@ -9,10 +9,6 @@ stage: deploy-part1 before_script: - 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 - ./tests/scripts/vagrant_clean.sh script: - ./tests/scripts/molecule_run.sh diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml index e7dbf73ff9f..a5bb2f521d1 100644 --- a/.gitlab-ci/vagrant.yml +++ b/.gitlab-ci/vagrant.yml @@ -13,10 +13,6 @@ image: $PIPELINE_IMAGE services: [] 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 - ./tests/scripts/vagrant_clean.sh script: - ./tests/scripts/testcases_run.sh diff --git a/pipeline.Dockerfile b/pipeline.Dockerfile index 8351cd87531..eb4dcf6d630 100644 --- a/pipeline.Dockerfile +++ b/pipeline.Dockerfile @@ -29,6 +29,7 @@ RUN apt update -q \ gnupg2 \ software-properties-common \ unzip \ + libvirt-clients \ && 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" \ && apt update -q \ diff --git a/tests/scripts/testcases_prepare.sh b/tests/scripts/testcases_prepare.sh index 38191cebd2a..aa4b285e509 100755 --- a/tests/scripts/testcases_prepare.sh +++ b/tests/scripts/testcases_prepare.sh @@ -1,8 +1,6 @@ #!/bin/bash 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 mkdir -p /.ssh mkdir -p cluster-dump mkdir -p $HOME/.ssh diff --git a/tests/scripts/vagrant_clean.sh b/tests/scripts/vagrant_clean.sh index 5a44956e247..c5df8cef606 100755 --- a/tests/scripts/vagrant_clean.sh +++ b/tests/scripts/vagrant_clean.sh @@ -3,8 +3,6 @@ set -euxo pipefail # Cleanup vagrant VMs to avoid name conflicts -apt-get install -y libvirt-clients - for i in $(virsh list --name) do virsh destroy "$i"