From 1955943d4aaab94fc477d4683f816b910bffcda7 Mon Sep 17 00:00:00 2001
From: Luke Simmons <luke.simmons@vgregion.se>
Date: Mon, 14 Aug 2023 14:11:21 +0200
Subject: [PATCH] Removes Ansible reinstall from pipeline (#10032)
---
.gitlab-ci.yml | 4 ----
.gitlab-ci/lint.yml | 5 -----
.gitlab-ci/molecule.yml | 5 -----
.gitlab-ci/vagrant.yml | 5 -----
pipeline.Dockerfile | 1 +
requirements.txt | 1 -
tests/scripts/testcases_prepare.sh | 3 ---
tests/scripts/vagrant_clean.sh | 2 --
8 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b6a9e41f..fb1e87872 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 51560118d..f8228672c 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 901f5fc35..071e29bc6 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 7992e6db6..c0250681b 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 8351cd875..eb4dcf6d6 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 d2724e99e..2420014f8 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 84d0a99ba..aa4b285e5 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 5a44956e2..c5df8cef6 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"
--
GitLab