From: David Galloway <dgallowa@redhat.com>
Date: Thu, 28 Apr 2022 14:31:48 +0000 (-0400)
Subject: ceph-{ansible,container}: Use python3.9 and pip==22.0.4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1993%2Fhead;p=ceph-build.git

ceph-{ansible,container}: Use python3.9 and pip==22.0.4

In order to install and use latest ansible

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-ansible-nightly/build/build b/ceph-ansible-nightly/build/build
index dd809f5a..845dce59 100644
--- a/ceph-ansible-nightly/build/build
+++ b/ceph-ansible-nightly/build/build
@@ -4,7 +4,8 @@
 pkgs=( "tox" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
-install_python_packages $TEMPVENV "pkgs[@]"
+set_centos_python3_version "python3.9"
+install_python_packages $TEMPVENV "pkgs[@]"  "pip==22.0.4"
 
 # XXX this might not be needed
 source $VENV/activate
diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build
index a16c91b1..20bf411e 100644
--- a/ceph-ansible-prs/build/build
+++ b/ceph-ansible-prs/build/build
@@ -4,7 +4,8 @@
 pkgs=( "tox" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
-install_python_packages $TEMPVENV "pkgs[@]"
+set_centos_python3_version "python3.9"
+install_python_packages $TEMPVENV "pkgs[@]" "pip==22.0.4"
 
 # XXX this might not be needed
 source $VENV/activate
diff --git a/ceph-ansible-scenario/build/build b/ceph-ansible-scenario/build/build
index 637f9c13..b952a1a7 100644
--- a/ceph-ansible-scenario/build/build
+++ b/ceph-ansible-scenario/build/build
@@ -4,7 +4,8 @@
 pkgs=( "tox" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
-install_python_packages $TEMPVENV "pkgs[@]"
+set_centos_python3_version "python3.9"
+install_python_packages $TEMPVENV "pkgs[@]" "pip==22.0.4"
 
 # XXX this might not be needed
 source $VENV/activate
diff --git a/ceph-container-nighlity/build/build b/ceph-container-nighlity/build/build
index b8e20b77..97864f31 100644
--- a/ceph-container-nighlity/build/build
+++ b/ceph-container-nighlity/build/build
@@ -4,7 +4,8 @@
 pkgs=( "tox" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
-install_python_packages $TEMPVENV "pkgs[@]"
+set_centos_python3_version "python3.9"
+install_python_packages $TEMPVENV "pkgs[@]" "pip==22.0.4"
 
 # XXX this might not be needed
 source $VENV/activate
diff --git a/ceph-container-prs/build/build b/ceph-container-prs/build/build
index b8e20b77..ad18d35c 100644
--- a/ceph-container-prs/build/build
+++ b/ceph-container-prs/build/build
@@ -4,7 +4,8 @@
 pkgs=( "tox" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
-install_python_packages $TEMPVENV "pkgs[@]"
+set_centos_python3_version "python3.9"
+install_python_packages $TEMPVENV "pkgs[@]"  "pip==22.0.4"
 
 # XXX this might not be needed
 source $VENV/activate
diff --git a/cephadm-ansible-prs/build/build b/cephadm-ansible-prs/build/build
index d3be0c34..cb570e9b 100644
--- a/cephadm-ansible-prs/build/build
+++ b/cephadm-ansible-prs/build/build
@@ -4,7 +4,8 @@
 pkgs=( "tox" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
-install_python_packages $TEMPVENV "pkgs[@]"
+set_centos_python3_version "python3.9"
+install_python_packages $TEMPVENV "pkgs[@]" "pip==22.0.4"
 
 # XXX this might not be needed
 source $VENV/activate