From b0fa47ff736862794f0640ba143771821e374d03 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 4 Dec 2019 08:11:02 +0100 Subject: [PATCH] jjb: Move to python3 Change-Id: Icd2ea48336e68fa3324e4a15740b09b84e0aa788 --- jjb/infra/jjb-merge.sh | 7 ++++++- jjb/infra/jjb-verify.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jjb/infra/jjb-merge.sh b/jjb/infra/jjb-merge.sh index fd377e6d..95d1d267 100755 --- a/jjb/infra/jjb-merge.sh +++ b/jjb/infra/jjb-merge.sh @@ -3,6 +3,11 @@ set -o errexit set -o nounset set -o pipefail +# install required packages +sudo apt update > /dev/null 2>&1 +sudo apt install -y -q=3 gcc libffi-dev libssl-dev lsb-release libpython3-dev \ + python3-minimal python3-pip python3-yaml virtualenv + # workaround for https://github.com/pypa/virtualenv/issues/1029 export PS1=${PS1:-} @@ -10,7 +15,7 @@ cd $WORKSPACE echo "Info: Installing OpenStack Jenkins Job Builder (JJB) version $JJB_VERSION from source in venv" echo "----------------------------------------------------" git clone -q $JJB_GIT_REPO -b $JJB_VERSION > /dev/null 2>&1 -virtualenv .venv -q +virtualenv -p python3 --quiet --no-site-packages .venv source .venv/bin/activate cd jenkins-job-builder && pip install -q -r test-requirements.txt -e . echo "Info: Installed JJB" diff --git a/jjb/infra/jjb-verify.sh b/jjb/infra/jjb-verify.sh index 9c74acf0..8389ae3d 100755 --- a/jjb/infra/jjb-verify.sh +++ b/jjb/infra/jjb-verify.sh @@ -3,6 +3,11 @@ set -o errexit set -o nounset set -o pipefail +# install required packages +sudo apt update > /dev/null 2>&1 +sudo apt install -y -q=3 gcc libffi-dev libssl-dev lsb-release libpython3-dev \ + python3-minimal python3-pip python3-yaml virtualenv + # workaround for https://github.com/pypa/virtualenv/issues/1029 export PS1=${PS1:-} @@ -10,7 +15,7 @@ cd $WORKSPACE echo "Info: Installing OpenStack Jenkins Job Builder (JJB) version $JJB_VERSION from source in venv" echo "----------------------------------------------------" git clone -q $JJB_GIT_REPO -b $JJB_VERSION > /dev/null 2>&1 -virtualenv .venv -q +virtualenv -p python3 --quiet --no-site-packages .venv source .venv/bin/activate cd jenkins-job-builder && pip install -q -r test-requirements.txt -e . echo "Info: Installed JJB" -- 2.25.1