Merge branch 'versions_update' into 'master'

Versions update See merge request !22
KaveIO · Nov 14, 2017 · 2e5ada5 · 2e5ada5
2 parents 5299728 + e6dfee5
commit 2e5ada5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/config/kavedefaults/condacomponent.py b/config/kavedefaults/condacomponent.py
@@ -93,7 +93,7 @@ def fillsrc(self):
 conda.pre["Centos7"] = conda.pre["Centos6"]
 conda.pre["Ubuntu14"] = ["apt-get -y install build-essential g++ libffi* "
                          "libsasl2-dev libsasl2-modules-gssapi-mit* cyrus-sasl2-mit* libgeos-dev"]
-conda.pre["Ubuntu16"] = conda.pre["Ubuntu14"] + ['apt-get -y install libstdc++6']
+conda.pre["Ubuntu16"] = conda.pre["Ubuntu14"] + ['apt-get -y install libstdc++6 libgl1-mesa-glx']
 conda.postwithenv = {"Centos6": ["conda update conda --yes", "conda install pip --yes",
                                  " if [ -f /etc/kave/requirements.txt ]; "
                                  "then pip install -r /etc/kave/requirements.txt; "

diff --git a/config/kavedefaults/gslcomponent.py b/config/kavedefaults/gslcomponent.py
@@ -28,41 +28,30 @@
 gsl1.version = "2.1.1"
 gsl1.src_from = [{"arch": "noarch", "suffix": ".tar.gz"},
                  "http://downloads.sourceforge.net/project/pygsl/pygsl/pygsl-2.1.1/pygsl-2.1.1.tar.gz"]
-gsl1.pre = {"Centos6": ["yum -y install gsl gsl-devel"]}
-gsl1.pre["Centos7"] = gsl1.pre["Centos6"]
-gsl1.pre["Ubuntu14"] = ["apt-get -y install build-essential g++ libgsl0-dev gsl-bin"]
-gsl1.prewithenv["Centos6"] = [' isinst=`python -c "import pkgutil; '
+gsl1.prewithenv["Centos7"] = [' isinst=`python -c "import pkgutil; '
                               'print(pkgutil.find_loader(\\"numpy\\") is not None);"`;'
                               ' if [ ${isinst} == "False" ]; then echo "no scipy/numpy installed,'
                               ' so will not install pygsl,'
                               ' turn on the anaconda installation! '
                               '(was it skipped?) or turn off pygsl." ; exit 1 ; fi ']
-gsl1.prewithenv["Centos7"] = gsl1.prewithenv["Centos6"]
-gsl1.prewithenv["Ubuntu14"] = gsl1.prewithenv["Centos6"]
-gsl1.prewithenv["Ubuntu16"] = gsl1.prewithenv["Ubuntu14"]
-
-gsl1.postwithenv = {"Centos6": [' isinst=`python -c "import pkgutil; '
+gsl1.prewithenv["Ubuntu16"] = gsl1.prewithenv["Centos7"]
+gsl1.postwithenv = {"Centos7": [' isinst=`python -c "import pkgutil; '
                                 'print(pkgutil.find_loader(\\"pygsl\\") is not None);"`;'
                                 ' if [ ${isinst} == "False" ]; then cd pygsl-*/; '
                                 'python setup.py config; python setup.py build; python setup.py install ; fi ']
                     }
-gsl1.postwithenv["Centos7"] = gsl1.postwithenv["Centos6"]
-gsl1.postwithenv["Ubuntu14"] = gsl1.postwithenv["Centos6"]
-gsl1.postwithenv["Ubuntu16"] = gsl1.postwithenv["Ubuntu14"]
+gsl1.postwithenv["Ubuntu16"] = gsl1.postwithenv["Centos7"]
 gsl1.usrspace = 3
 gsl1.tempspace = 2
 
-
 # ######################  pygsl 2.2 ############################
 import copy
 # Use for Ubuntu16 only for now, does not work on Centos6 or Ubuntu14
 gsl2 = copy.deepcopy(gsl1)
 gsl2.version = "2.2.0"
 gsl2.src_from = [gsl2.src_from[0],
                  "http://downloads.sourceforge.net/project/pygsl/pygsl/pygsl-2.2.0/pygsl-2.2.0.tar.gz"]
-gsl2.prewithenv["Ubuntu16"] = gsl2.prewithenv["Ubuntu14"]
-gsl2.pre["Ubuntu16"] = gsl2.pre["Ubuntu14"]
-gsl2.postwithenv["Ubuntu16"] = gsl2.postwithenv["Ubuntu14"]
+gsl2.prewithenv["Ubuntu16"] = gsl2.prewithenv["Centos7"]
 
 # ######################  pygsl parent ############################
 
@@ -77,10 +66,10 @@ def skipif(self):
 
 gsl = GslComponent("pygsl")
 gsl.doInstall = True
-gsl.children = {"Centos6": [gsl1],
-                "Centos7": [gsl1],
-                "Ubuntu14": [gsl1],
-                "Ubuntu16": [gsl1]}
+gsl.pre = {"Centos7": ["yum -y install gsl gsl-devel"],
+           "Ubuntu16": ["apt-get -y install build-essential g++ libgsl0-dev gsl-bin libgl1-mesa-glx"]}
+gsl.children = {"Centos7": [gsl1],
+                "Ubuntu16": [gsl2]}
 gsl.tests = [("python -c \"import pygsl;\"", 0, '', '')]
 
 

diff --git a/docker/u16.node/Dockerfile b/docker/u16.node/Dockerfile
@@ -1,7 +1,7 @@
 # KaveToolbox 3.6-Beta on ubuntu 16
-FROM ubuntu:xenial-20171006
+FROM ubuntu:xenial
 MAINTAINER KAVE <kave@kpmg.com>
 RUN apt-get update && apt-get upgrade -y && apt-get dist-upgrade -y
 RUN apt-get install -y wget curl python python-dev
 RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.6-Beta/kavetoolbox-installer-3.6-Beta.sh
-RUN /bin/bash kavetoolbox-installer-3.6-Beta.sh --node
+RUN /bin/bash kavetoolbox-installer-3.6-Beta.sh --node
diff --git a/tests/docker/localdocker.py b/tests/docker/localdocker.py
@@ -24,7 +24,7 @@
 
 
 class TestLocalDocker(unittest.TestCase):
-    start = "ubuntu:16.04"
+    start = "ubuntu:xenial"
     verbose = False
     os_script = {"ubuntu": ["apt-get update", "apt-get install -y wget curl python python-dev"],
                  "centos": ["yum clean all", "yum -y install wget curl python python-devel"]}