[ARVADOS] updated: 1.4.0-22-gcff7ea942

[Git user]

Summary of changes:
 build/package-build-dockerfiles/centos7/Dockerfile    | 6 +++---
 build/run-build-packages.sh                           | 2 +-
 doc/admin/upgrading.html.textile.liquid               | 8 +++++++-
 services/dockercleaner/arvados-docker-cleaner.service | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

       via  cff7ea9429ccfd950bbd8df6153f9f80b6e112eb (commit)
       via  c8c75cbc7afec458427a1b4384eda9d3b62a8014 (commit)
      from  ce4e615391bfda40400fd1ca6e03eab6aa4fd77e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit cff7ea9429ccfd950bbd8df6153f9f80b6e112eb
Author: Fernando Monserrat <fmonserrat at veritasgenetics.com>
Date:   Fri Sep 20 12:49:15 2019 -0300

    15648: update documentation adding upgrade to rh-python36
    
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 053acb220..894e31b86 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -30,7 +30,13 @@ Note to developers: Add new items at the top. Include the date, issue number, co
 TODO: extract this information based on git commit messages and generate changelogs / release notes automatically.
 {% endcomment %}
 
-h3. v1.4.0 (2019-05-31)
+h3(#v1_4_1). v1.4.1 (2019-09-20)
+
+h4. Centos7 Python 3 dependency upgraded to rh-python36
+
+The Python 3 dependency for Centos7 Arvados packages was upgraded from rh-python35 to rh-python36.
+
+h3(#v1_4_0). v1.4.0 (2019-06-05)
 
 h4. Populating the new file_count and file_size_total columns on the collections table
 

commit c8c75cbc7afec458427a1b4384eda9d3b62a8014
Author: Fernando Monserrat <fmonserrat at veritasgenetics.com>
Date:   Thu Sep 19 15:57:59 2019 -0300

    15648: update to rh-python36
    
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index ad6f4e1e8..01729c9bf 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -29,8 +29,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
@@ -42,4 +42,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 b800d43e0..30963fac8 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 29697e440..fca8d8b12 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

-----------------------------------------------------------------------


hooks/post-receive
--