diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b6a9e41fb37dc113cefc3b3aaa44eebab8625dd..fb1e8787260a529e51bd70e6e813f8fd6ade201a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,10 +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 - - ansible-galaxy install -r tests/requirements.yml - mkdir -p /.ssh .job: &job diff --git a/.gitlab-ci/lint.yml b/.gitlab-ci/lint.yml index 51560118dabb5da4b387ab43ffa93f4ddf6112b1..f8228672c635be2cf8e396b3ca55440c33e43e77 100644 --- a/.gitlab-ci/lint.yml +++ b/.gitlab-ci/lint.yml @@ -67,11 +67,6 @@ tox-inventory-builder: extends: .job 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 - - ansible-galaxy install -r tests/requirements.yml script: - pip3 install tox - cd contrib/inventory_builder && tox diff --git a/.gitlab-ci/molecule.yml b/.gitlab-ci/molecule.yml index 901f5fc355869ca5beaa69971f107e08ee5ac49f..071e29bc69ad282b7243164b6fd36195c79f994c 100644 --- a/.gitlab-ci/molecule.yml +++ b/.gitlab-ci/molecule.yml @@ -9,11 +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 - - ansible-galaxy install -r tests/requirements.yml - ./tests/scripts/vagrant_clean.sh script: - ./tests/scripts/molecule_run.sh diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml index 7992e6db6433ec267d548cb024fbd0b5c36f63b2..c0250681b895d9ca51c1b98eed40803b949d9ea1 100644 --- a/.gitlab-ci/vagrant.yml +++ b/.gitlab-ci/vagrant.yml @@ -13,11 +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 - - ansible-galaxy install -r tests/requirements.yml - ./tests/scripts/vagrant_clean.sh script: - ./tests/scripts/testcases_run.sh diff --git a/pipeline.Dockerfile b/pipeline.Dockerfile index 8351cd8753144f9e2d8b72782004ab71f2907f9a..eb4dcf6d630bd4116a8c35e2bc92e9309e8e36d6 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/requirements.txt b/requirements.txt index d2724e99e5b49f53453b5ff62f8c8a208299e91e..2420014f8d3b8e64174b47a7f205b9801a50a280 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ ansible==7.6.0 -ansible-core==2.14.6 cryptography==41.0.1 jinja2==3.1.2 jmespath==1.0.1 diff --git a/tests/scripts/testcases_prepare.sh b/tests/scripts/testcases_prepare.sh index 84d0a99ba2786d35cda133f4cafe43d5ba2dd49f..aa4b285e50949d594b3b80a85d0bc416dd7b88d1 100755 --- a/tests/scripts/testcases_prepare.sh +++ b/tests/scripts/testcases_prepare.sh @@ -1,9 +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 -ansible-galaxy install -r tests/requirements.yml 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 5a44956e2473243256e4af77cecc13043853b174..c5df8cef606e3b83666b6b203ad362b750431fe3 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"