[ARVADOS] updated: 1.3.0-1616-g5bbf25e6e

Git user git at public.curoverse.com
Fri Sep 20 20:24:25 UTC 2019


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

       via  5bbf25e6e165455a9edc639fa4096e2aa7b35703 (commit)
       via  91e6b4f16baa92a234007fd7442976cf2340a7cc (commit)
       via  474c0be6cf3beb536e83a42a08220313e303decf (commit)
      from  8da39e55beb95fa6f2408c86803e5a003bcd8ae5 (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 5bbf25e6e165455a9edc639fa4096e2aa7b35703
Merge: 8da39e55b 91e6b4f16
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Fri Sep 20 16:23:41 2019 -0400

    Merge branch '15648-centos7-upgrade-to-rh-python36'
    
    closes #15648
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>


commit 91e6b4f16baa92a234007fd7442976cf2340a7cc
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 e1e29ed12..ddb52fc23 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -98,6 +98,12 @@ h4. Migrating to centralized config.yml
 
 See "Migrating Configuration":config-migration.html for notes on migrating legacy per-component configuration files to the new centralized @/etc/arvados/config.yml at .  To ensure a smooth transition, the per-component config files continue to be read, and take precedence over the centralized configuration.
 
+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 474c0be6cf3beb536e83a42a08220313e303decf
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 7219edb37..916c4abbb 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 bebcae065..fd313cf10 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
-- 




More information about the arvados-commits mailing list