diff --git a/pipeline-steps/common.groovy b/pipeline-steps/common.groovy index 06c72c021..3a41cdaab 100644 --- a/pipeline-steps/common.groovy +++ b/pipeline-steps/common.groovy @@ -20,6 +20,7 @@ def install_ansible(){ # installing pip resets the shebang to be absolute virtualenv --relocatable .venv pip install -U ansible pyrax + virtualenv --relocatable .venv """ } diff --git a/pipeline-steps/horizon.groovy b/pipeline-steps/horizon.groovy index 1bd729020..d5bc4c711 100644 --- a/pipeline-steps/horizon.groovy +++ b/pipeline-steps/horizon.groovy @@ -32,6 +32,7 @@ def mitaka_prep() { if [[ ! -d ".venv" ]]; then pip install virtualenv virtualenv .venv + virtualenv --relocatable .venv fi source .venv/bin/activate @@ -39,6 +40,7 @@ def mitaka_prep() { pip install selenium==2.53.1 pip install -r test-requirements.txt pip install -r requirements.txt + virtualenv --relocatable .venv mv ~/.pip/pip.conf.bak ~/.pip/pip.conf """ } diff --git a/pipeline-steps/kibana.groovy b/pipeline-steps/kibana.groovy index a5d900d49..a7ccea86c 100644 --- a/pipeline-steps/kibana.groovy +++ b/pipeline-steps/kibana.groovy @@ -28,9 +28,11 @@ def kibana_prep(){ if [ -f ~/.pip/pip.conf ]; then mv ~/.pip/pip.conf ~/.pip/pip.conf.bak pip install -r requirements.txt + virtualenv --relocatable .venv mv ~/.pip/pip.conf.bak ~/.pip/pip.conf else pip install -r requirements.txt + virtualenv --relocatable .venv fi """ } diff --git a/pipeline-steps/ssh_slave.groovy b/pipeline-steps/ssh_slave.groovy index f34e82cba..a57519d2b 100644 --- a/pipeline-steps/ssh_slave.groovy +++ b/pipeline-steps/ssh_slave.groovy @@ -47,6 +47,7 @@ def destroy(Map args){ sh """ . ../playbooks/.venv/bin/activate pip install jenkinsapi + virtualenv --relocatable ../playbooks/.venv python jenkins_node.py \ delete --name "${args.instance_name}" """ diff --git a/playbooks/setup-jenkins-slave.yml b/playbooks/setup-jenkins-slave.yml index 144b13b2b..e3b2c0e04 100644 --- a/playbooks/setup-jenkins-slave.yml +++ b/playbooks/setup-jenkins-slave.yml @@ -76,6 +76,7 @@ cd {{ lookup('env', 'WORKSPACE') }}/rpc-gating/playbooks . .venv/bin/activate pip install jenkinsapi + virtualenv --relocatable .venv python ../scripts/jenkins_node.py \ create \ --name {{inventory_hostname}} \ diff --git a/rpc-jobs/install-jenkins-plugins.yml b/rpc-jobs/install-jenkins-plugins.yml index f4b110d23..02b2f6727 100644 --- a/rpc-jobs/install-jenkins-plugins.yml +++ b/rpc-jobs/install-jenkins-plugins.yml @@ -20,6 +20,7 @@ sh """#!/bin/bash . .venv/bin/activate pip install urllib3==1.18.1 + virtualenv --relocatable .venv """ common.venvPlaybook( playbooks: ["playbooks/install_jenkins_plugins.yml"], diff --git a/rpc-jobs/jjb-setup.yml b/rpc-jobs/jjb-setup.yml index cc94d61ab..54065b779 100644 --- a/rpc-jobs/jjb-setup.yml +++ b/rpc-jobs/jjb-setup.yml @@ -40,6 +40,7 @@ source .venv/bin/activate pip install jenkins-job-builder + virtualenv --relocatable .venv cat > jenkins_jobs.ini << EOF [job-builder]