From 474c0be6cf3beb536e83a42a08220313e303decf Mon Sep 17 00:00:00 2001 From: Fernando Monserrat Date: Thu, 19 Sep 2019 15:57:59 -0300 Subject: [PATCH] 15648: update to rh-python36 Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat --- build/package-build-dockerfiles/centos7/Dockerfile | 6 +++--- build/run-build-packages.sh | 2 +- services/dockercleaner/arvados-docker-cleaner.service | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile index 7219edb37e..916c4abbb0 100644 --- a/build/package-build-dockerfiles/centos7/Dockerfile +++ b/build/package-build-dockerfiles/centos7/Dockerfile @@ -39,8 +39,8 @@ RUN ln -s /usr/local/node-v6.11.2-linux-x64/bin/* /usr/local/bin/ # Need to "touch" RPM database to workaround bug in interaction between # overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602) -RUN touch /var/lib/rpm/* && yum -q -y install rh-python35 -RUN scl enable rh-python35 "easy_install-3.5 pip" && easy_install-2.7 pip +RUN touch /var/lib/rpm/* && yum -q -y install rh-python36 +RUN scl enable rh-python36 "easy_install-3.6 pip" && easy_install-2.7 pip # Add epel, we need it for the python-pam dependency RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm @@ -52,4 +52,4 @@ RUN git clone --depth 1 git://git.curoverse.com/arvados.git /tmp/arvados && cd / RUN pip install --upgrade setuptools ENV WORKSPACE /arvados -CMD ["scl", "enable", "rh-python35", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"] +CMD ["scl", "enable", "rh-python36", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"] diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index bebcae0653..fd313cf10e 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -127,7 +127,7 @@ case "$TARGET" in PYTHON2_INSTALL_LIB=lib/python$PYTHON2_VERSION/site-packages PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n') PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE - PYTHON3_PREFIX=/opt/rh/rh-python35/root/usr + PYTHON3_PREFIX=/opt/rh/rh-python36/root/usr PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/site-packages export PYCURL_SSL_LIBRARY=nss ;; diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service index 29697e440a..fca8d8b126 100644 --- a/services/dockercleaner/arvados-docker-cleaner.service +++ b/services/dockercleaner/arvados-docker-cleaner.service @@ -23,7 +23,7 @@ RestartPreventExitStatus=2 # This unwieldy ExecStart command detects at runtime whether # arvados-docker-cleaner is installed with the Python 3.3 Software # Collection, and if so, invokes it with the "scl" wrapper. -ExecStart=/bin/sh -c 'if [ -e /opt/rh/rh-python35/root/bin/arvados-docker-cleaner ]; then exec scl enable rh-python35 arvados-docker-cleaner; else exec arvados-docker-cleaner; fi' +ExecStart=/bin/sh -c 'if [ -e /opt/rh/rh-python36/root/bin/arvados-docker-cleaner ]; then exec scl enable rh-python36 arvados-docker-cleaner; else exec arvados-docker-cleaner; fi' # systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section StartLimitInterval=0 -- 2.30.2