Skip to content

Commit f329d3a

Browse files
author
Marek Skalický
committed
Use docker-squash=1.0.5 from pypi
Version from brew has broken dependencies because of updated python-docker
1 parent b83c585 commit f329d3a

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jenkins_jobs.ini
2+
jenkins_jobs_rhscl.ini
3+
local/

yaml/builders/prepare-centos.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
3535
# Prepare docker
3636
ssh -F ssh_config host yum -y install docker perl git centos-release-scl-rh rsync golang-github-cpuguy83-go-md2man groff-base centos-release-openshift-origin epel-release
37-
ssh -F ssh_config host yum -y install source-to-image python27-python-virtualenv origin-clients distgen
37+
ssh -F ssh_config host yum -y install source-to-image rh-python36-python-virtualenv origin-clients distgen
3838
ssh -F ssh_config host "sed -i \"s|OPTIONS='|OPTIONS='--insecure-registry 172.30.0.0/16 |\" /etc/sysconfig/docker; iptables -F"
3939
ssh -F ssh_config host service docker start
4040
# Install docker-squash
41-
ssh -F ssh_config host 'scl enable python27 -- virtualenv --python /usr/bin/python /usr/local/docker-squash && . /usr/local/docker-squash/bin/activate && \
42-
pip install "docker-squash==1.0.5" && echo ". /usr/local/docker-squash/bin/activate" > ~/.bashrc'
41+
ssh -F ssh_config host 'scl enable rh-python36 -- virtualenv --python python3 /usr/local/docker-squash && . /usr/local/docker-squash/bin/activate && \
42+
pip install "docker-squash==1.0.5" && echo ". /usr/local/docker-squash/bin/activate" > /root/.bashrc'
4343
# Enable sudo for ssh (required by test cases)
4444
ssh -F ssh_config host 'sed -i -e "s|Defaults requiretty||" /etc/sudoers'
4545

yaml/builders/prepare-rhel.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,8 @@
3232
# Prepare distgen (TEMPORARY FIX - https://gitlab.cee.redhat.com/platform-eng-core-services/coreservices-jenkins-slaves/merge_requests/16)
3333
ssh -F ssh_config host yum -y install epel-release
3434
ssh -F ssh_config host yum -y install distgen
35+
36+
# Install docker-squash (TEMPORARY FIX - https://gitlab.cee.redhat.com/platform-eng-core-services/coreservices-jenkins-slaves/merge_requests/17)
37+
ssh -F ssh_config host yum -y install rh-python36-python-virtualenv
38+
ssh -F ssh_config host 'scl enable rh-python36 -- virtualenv --python python3 /usr/local/docker-squash && . /usr/local/docker-squash/bin/activate && \
39+
pip install "docker-squash==1.0.5" && echo ". /usr/local/docker-squash/bin/activate" > /root/.bashrc'

0 commit comments

Comments
 (0)