Using full version to build images locally instead of pulling them

Author: diemol

Makefile

@@ -239,31 +239,31 @@ test: test_chrome \
 
 
 test_chrome:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
 
 test_chrome_debug:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChromeDebug
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChromeDebug
 
 test_chrome_standalone:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChrome
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChrome
 
 test_chrome_standalone_debug:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChromeDebug
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChromeDebug
 
 test_firefox:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefox
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefox
 
 test_firefox_debug:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefoxDebug
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefoxDebug
 
 test_firefox_standalone:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
 
 test_firefox_standalone_debug:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefoxDebug
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefoxDebug
 
 test_phantomjs:
-	VERSION=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodePhantomJS
+	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodePhantomJS
 
 
 .PHONY: \

tests/SmokeTests/__init__.py

@@ -7,7 +7,7 @@
 
 class SmokeTests(unittest.TestCase):
     def smoke_test_container(self, port):
-        build_version = os.environ.get('VERSION')
+        build_version = os.environ.get('MAJOR_MINOR_PATCH')
         current_attempts = 0
         max_attempts = 3
         sleep_interval = 3

tests/test.py

@@ -53,6 +53,7 @@
     'NodePhantomJS': 'PhantomJSTests',
 }
 
+
 def launch_hub():
     """
     Launch the hub
@@ -88,11 +89,12 @@ def launch_container(container, **kwargs):
     """
     # Build the container if it doesn't exist
     logger.info("Building %s container..." % container)
-    client.images.build(path='../%s' % container)
+    client.images.build(path='../%s' % container,
+                        tag="%s/%s:%s" % (NAMESPACE, IMAGE_NAME_MAP[container], VERSION),
+                        rm=True)
     logger.info("Done building %s" % container)
 
     # Run the container
-    # TODO: This is pulling the container, not using the built one
     logger.info("Running %s container..." % container)
     container_id = client.containers.run("%s/%s:%s" % (NAMESPACE, IMAGE_NAME_MAP[container], VERSION),
                                          detach=True,