Skip to content

Commit 5a11184

Browse files
zuul: pin GitPython <2.1.2
See: gitpython-developers/GitPython#605 This change also fixes the nodepool health check where the last image includes the jenkins repository which trigger an unexpected update of jenkins when slave image is prepared Change-Id: I60c919cdd987a9f3b8556b8e5f92f0f169cc392c
1 parent 754a107 commit 5a11184

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

config/ansible/roles/sf-zuul/tasks/install.yml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- virtualenv /srv/zuul
1414
- /srv/zuul/bin/pip install --upgrade pbr pip
1515
- sed -i 's/^pbr.*//' requirements.txt
16+
- sed -i 's/^GitPython.*/GitPython>=0.3.3,<2.1.2/' requirements.txt
1617
- /srv/zuul/bin/pip install -rrequirements.txt
1718
- /srv/zuul/bin/pip install python-swiftclient python-keystoneclient
1819
- /srv/zuul/bin/python setup.py install

health-check/files/nodepool_demo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# This script re-use a software-factory image as a nodepool slave
33

4-
sudo edeploy activate-pkgmngr
4+
sudo rm /etc/yum.repos.d/jenkins.repo
55
sudo userdel jenkins
66

77
# Set tests domain name to the nodepool client ip

0 commit comments

Comments
 (0)