Merge branch '77_move_to_new_images' into 'master'

Move to new images

See merge request !120

beat/core/test/prefix/experiments/errors/user/double/1/cxx_analyzer_error.json

@@ -37,7 +37,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "2.0.0"
     }
   }

beat/core/test/prefix/experiments/errors/user/single/1/prepare_error.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/errors/user/single/1/setup_error.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/errors/user/single/1/single_crash.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/errors/user/single/1/single_db_crash.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/errors/user/single/1/single_error.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/errors/user/single/1/single_error2.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/errors/user/single/1/write_error.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/errors/user/triangle/1/too_many_nexts.json

@@ -52,7 +52,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/double/1/cxx_double.json

@@ -17,7 +17,7 @@
         "out_data": "out"
       },
       "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "1.1.0"
       }
     },
@@ -30,7 +30,7 @@
         "out_data": "out"
       },
       "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "1.1.0"
       }
     }
@@ -45,7 +45,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/double/1/cxx_double_autonomous.json

@@ -17,7 +17,7 @@
         "out_data": "out"
       },
       "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "2.0.0"
       }
     },
@@ -30,7 +30,7 @@
         "out_data": "out"
       },
       "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "2.0.0"
       }
     }
@@ -45,7 +45,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/double/1/cxx_double_legacy.json

@@ -17,7 +17,7 @@
         "out_data": "out"
       },
       "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "2.0.0"
       }
     },
@@ -30,7 +30,7 @@
         "out_data": "out"
       },
       "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "2.0.0"
       }
     }
@@ -45,7 +45,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/double/1/cxx_double_sequential.json

@@ -17,7 +17,7 @@
         "out_data": "out"
       },
       "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "2.0.0"
       }
     },
@@ -30,7 +30,7 @@
         "out_data": "out"
       },
       "environment": {
-        "name": "Cxx backend",
+        "name": "C++",
         "version": "2.0.0"
       }
     }
@@ -45,7 +45,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/double/1/double.json

@@ -37,7 +37,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/double/1/large.json

@@ -37,7 +37,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/double/1/large2.json

@@ -37,7 +37,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/double_triangle/1/double_triangle.json

@@ -70,7 +70,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/inputs_mix/1/test.json

@@ -43,7 +43,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue"

beat/core/test/prefix/experiments/user/user/inputs_mix/2/test.json

@@ -48,7 +48,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue"

beat/core/test/prefix/experiments/user/user/inputs_mix/3/test.json

@@ -49,7 +49,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue"

beat/core/test/prefix/experiments/user/user/inputs_mix/3/test2.json

@@ -49,7 +49,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue",

beat/core/test/prefix/experiments/user/user/inputs_mix/4/test.json

@@ -61,7 +61,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue"

beat/core/test/prefix/experiments/user/user/inputs_mix/4/test2.json

@@ -61,7 +61,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue",

beat/core/test/prefix/experiments/user/user/integers_addition/1/integers_addition.json

@@ -32,7 +32,7 @@
     },
     "globals": {
       "environment": {
-        "name": "Python 2.7",
+        "name": "Python for tests",
         "version": "1.3.0"
       },
       "queue": "queue"

beat/core/test/prefix/experiments/user/user/integers_addition/2/integers_addition.json

@@ -44,7 +44,7 @@
     },
     "globals": {
       "environment": {
-        "name": "Python 2.7",
+        "name": "Python for tests",
         "version": "1.3.0"
       },
       "queue": "queue"

beat/core/test/prefix/experiments/user/user/integers_addition/3/integers_addition.json

@@ -61,7 +61,7 @@
     },
     "globals": {
       "environment": {
-        "name": "Python 2.7",
+        "name": "Python for tests",
         "version": "1.3.0"
       },
       "queue": "queue"

beat/core/test/prefix/experiments/user/user/integers_echo/1/integers_echo.json

@@ -31,7 +31,7 @@
     },
     "globals": {
       "environment": {
-        "name": "Python 2.7",
+        "name": "Python for tests",
         "version": "1.3.0"
       },
       "queue": "queue"

beat/core/test/prefix/experiments/user/user/integers_labelled/1/test.json

@@ -32,7 +32,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue"

beat/core/test/prefix/experiments/user/user/loop/1/loop.json

@@ -59,7 +59,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue",

beat/core/test/prefix/experiments/user/user/preprocessing/1/different_frequencies.json

@@ -38,7 +38,7 @@
     "globals": {
         "queue": "queue",
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         }
     }

beat/core/test/prefix/experiments/user/user/single/1/prepare_success.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/single/1/single.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/single/1/single_add.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     },
     "v1/integers_add/1": {

beat/core/test/prefix/experiments/user/user/single/1/single_add2.json

@@ -28,7 +28,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     },
     "v1/integers_add/1": {

beat/core/test/prefix/experiments/user/user/single/1/single_large.json

@@ -33,7 +33,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/triangle/1/triangle.json

@@ -52,7 +52,7 @@
   "globals": {
     "queue": "queue",
     "environment": {
-      "name": "Python 2.7",
+      "name": "Python for tests",
       "version": "1.3.0"
     }
   }

beat/core/test/prefix/experiments/user/user/two_loops/1/two_loops.json

@@ -96,7 +96,7 @@
     },
     "globals": {
         "environment": {
-            "name": "Python 2.7",
+            "name": "Python for tests",
             "version": "1.3.0"
         },
         "queue": "queue",

beat/core/test/test_bcp.py

@@ -80,7 +80,7 @@ CONFIGURATION1 = {
     },
     "algorithm": "legacy/echo/1",
     "parameters": {},
-    "environment": {"name": "Python 2.7", "version": "1.3.0"},
+    "environment": {"name": "Python for tests", "version": "1.3.0"},
     "outputs": {
         "out": {
             "path": "20/61/b6/2df3c3bedd5366f4a625c5d87ffbf5a26007c46c456e9abf21b46c6681",
@@ -113,7 +113,7 @@ CONFIGURATION2 = {
     },
     "algorithm": "legacy/echo/1",
     "parameters": {},
-    "environment": {"name": "Python 2.7", "version": "1.3.0"},
+    "environment": {"name": "Python for tests", "version": "1.3.0"},
     "outputs": {
         "out": {
             "path": "40/61/b6/2df3c3bedd5366f4a625c5d87ffbf5a26007c46c456e9abf21b46c6681",

beat/core/test/test_docker.py

@@ -251,7 +251,7 @@ class AsyncWithEnvironmentTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.host = Host(raise_on_errors=False)
-        cls.test_environment = cls.host.full_environment_name("Python 2.7")
+        cls.test_environment = cls.host.full_environment_name("Python for tests")
 
     @classmethod
     def tearDownClass(cls):
@@ -338,7 +338,6 @@ class AsyncWithEnvironmentTest(unittest.TestCase):
         self.assertEqual(self.host.logs(container).strip(), "Before\nAfter")
 
     def _run_cpulimit(self, processes, max_cpu_percent, sleep_time):
-
         tmp_folder = tempfile.gettempdir()
         program = pkg_resources.resource_filename(__name__, "cpu_stress.py")
         dst_name = os.path.join(tmp_folder, os.path.basename(program))
@@ -400,7 +399,7 @@ class HostTest(unittest.TestCase):
         nb_images = len(Host.images_cache)
         self.assertTrue(nb_images > 0)
 
-        self.assertTrue(stop - start > 2.0)
+        self.assertTrue(stop - start < 2.0)
 
         # Should be instantaneous
         start = time.time()
@@ -432,7 +431,7 @@ class HostTest(unittest.TestCase):
         nb_images = len(Host.images_cache)
         self.assertTrue(nb_images > 0)
 
-        self.assertTrue(stop - start > 2.0)
+        self.assertTrue(stop - start < 2.0)
 
         Host.images_cache = {}
 

beat/core/test/test_docker_databases_provider.py

@@ -72,7 +72,7 @@ CONFIGURATION = {
     },
     "algorithm": "v1/integers_echo/1",
     "parameters": {},
-    "environment": {"name": "Python 2.7", "version": "1.2.0"},
+    "environment": {"name": "Python for tests", "version": "1.3.0"},
     "outputs": {
         "out_data": {
             "path": "20/61/b6/2df3c3bedd5366f4a625c5d87ffbf5a26007c46c456e9abf21b46c6681",

beat/core/test/test_docker_environments.py

@@ -46,9 +46,7 @@ from .utils import slow
 class EnvironmentTest(unittest.TestCase):
     def setUp(self):
         self.host = Host(raise_on_errors=False)
-        self.test_environment = self.host.full_environment_name(
-            "Cxx development environment"
-        )
+        self.test_environment = self.host.full_environment_name("C++")
 
     def tearDown(self):
         self.host.teardown()

beat/core/test/test_docker_execution.py

@@ -55,7 +55,7 @@ from . import DOCKER_NETWORK_TEST_ENABLED
 
 from .utils import DOCKER_TEST_IMAGES
 
-BUILDER_CONTAINER_NAME = "docker.idiap.ch/beat/beat.env.client"
+BUILDER_CONTAINER_NAME = "docker.idiap.ch/beat/beat.env.builder/beat.env.cxxdev"
 BUILDER_IMAGE = (
     BUILDER_CONTAINER_NAME + ":" + DOCKER_TEST_IMAGES[BUILDER_CONTAINER_NAME]
 )

beat/core/test/test_lib.py

@@ -116,7 +116,6 @@ def test_invalid_mix():
 
 
 def test_duplicate_key():
-
     lib = Library(prefix, "errors/duplicate_key/1")
     nose.tools.assert_false(lib.valid)
     nose.tools.eq_(len(lib.errors), 1)

beat/core/test/test_worker.py

@@ -85,7 +85,7 @@ CONFIGURATION1 = {
     },
     "algorithm": "legacy/echo/1",
     "parameters": {},
-    "environment": {"name": "Python 2.7", "version": "1.3.0"},
+    "environment": {"name": "Python for tests", "version": "1.3.0"},
     "outputs": {
         "out": {
             "path": "20/61/b6/2df3c3bedd5366f4a625c5d87ffbf5a26007c46c456e9abf21b46c6681",
@@ -118,7 +118,7 @@ CONFIGURATION2 = {
     },
     "algorithm": "legacy/echo/1",
     "parameters": {},
-    "environment": {"name": "Python 2.7", "version": "1.3.0"},
+    "environment": {"name": "Python for tests", "version": "1.3.0"},
     "outputs": {
         "out": {
             "path": "40/61/b6/2df3c3bedd5366f4a625c5d87ffbf5a26007c46c456e9abf21b46c6681",

beat/core/test/utils.py

@@ -48,10 +48,10 @@ import docker
 
 # Images used for docker-enabled tests within this and other BEAT packages
 DOCKER_TEST_IMAGES = {
-    "docker.idiap.ch/beat/beat.env.system.python": "1.3.0r5",
-    "docker.idiap.ch/beat/beat.env.db.examples": "1.4.0r5",
-    "docker.idiap.ch/beat/beat.env.cxx": "2.0.0r1",
-    "docker.idiap.ch/beat/beat.env.client": "2.0.0r1",
+    "docker.idiap.ch/beat/beat.env.builder/beat.env.python.tests": "1.3.0r6",
+    "docker.idiap.ch/beat/beat.env.builder/beat.env.db.examples": "1.4.0r6",
+    "docker.idiap.ch/beat/beat.env.builder/beat.env.cxx": "2.0.0r3",
+    "docker.idiap.ch/beat/beat.env.builder/beat.env.cxxdev": "2.0.0r3",
 }