Fix image counting in build subtest (#640)

default image is not always build base image

In these situations, the image count can be off because docker build
will pull the base-image.  This changes moves the accounting for
existing images, after a 'docker pull' of the default image.  Then for
each remote dockerfile test, configure it's base-image explicitly in
case the global base image is different.

Also, resolved old build sub-subtest FIXME

Signed-off-by: Chris Evich <[email protected]>

Author: cevich

config_defaults/subtests/docker_cli/build.ini

@@ -75,13 +75,23 @@ dockerfile_dir_path = /full
 __example__ = dockerfile_dir_path, postproc_cmd_csv
 use_config_repo = no
 dockerfile_dir_path = https://raw.githubusercontent.com/autotest/autotest-docker/master/subtests/docker_cli/build/full/Dockerfile
+# Hard code this to base-image used in remote dockerfile (above)
+docker_registry_host = docker.io
+docker_registry_user = stackbrew
+docker_repo_name = centos
+docker_repo_tag = 7
 # Inherits options from main subtest section (above)
 # no need to repeat them here.
 
 [docker_cli/build/git_path]
 __example__ = dockerfile_dir_path, postproc_cmd_csv
 use_config_repo = no
 dockerfile_dir_path = git://github.com/autotest/autotest-docker.git
+# Hard code this to base-image used in remote dockerfile (above)
+docker_registry_host = docker.io
+docker_registry_user = stackbrew
+docker_repo_name = centos
+docker_repo_tag = 7
 postproc_cmd_csv = positive(),
                    rx_out('Removing intermediate container'),
                    rx_out('\s*Successfully built\s*(\w{64}|\w{12})'),

subtests/docker_cli/build/build.py

@@ -223,8 +223,7 @@ def basic_postprocess(build_def, command, parameter):
             if OutputGood(build_def.dockercmd.cmdresult,
                           ignore_error=True,
                           skip=['error_check']):
-                # FIXME: this is likely to fail in docker-1.10; bz1097344
-                return build_def.dockercmd.cmdresult.exit_status == 1
+                return build_def.dockercmd.cmdresult.exit_status != 0
         else:
             raise DockerTestError("Command error: %s" % command)
 
@@ -428,15 +427,13 @@ def initialize_utils(self):
         # Get the latest container (remove all newly created in cleanup
         self.sub_stuff['dc'] = DockerContainers(self)
         self.sub_stuff['di'] = DockerImages(self)
-        pec = self.parent_subtest.stuff['existing_containers']
-        self.sub_stuff['existing_containers'] = pec
-        pei = self.parent_subtest.stuff['existing_images']
-        self.sub_stuff['existing_images'] = pei
 
     def make_builds(self, source):
         dimg = self.sub_stuff['di']
         image_name = dimg.get_unique_name()
         base_repo_fqin = DockerImage.full_name_from_defaults(source)
+        # Existing images recorded after this method runs
+        DockerCmd(self, 'pull', [base_repo_fqin]).execute()
         use_config_repo = source['use_config_repo']
         postproc_cmd_csv = source['postproc_cmd_csv']
         dockerfile_dir_path = source['dockerfile_dir_path'].strip()
@@ -482,7 +479,13 @@ def initialize(self):
         super(build_base, self).initialize()
         self.initialize_utils()
         self.sub_stuff['builds'] = []
+        # Side-effect: docker pulls the base-image
         self.sub_stuff['builds'] += self.make_builds(self.config)
+        pec = self.parent_subtest.stuff['existing_containers']
+        self.sub_stuff['existing_containers'] = pec
+        # Count after pulling base-image
+        pei = self.parent_subtest.stuff['existing_images']
+        self.sub_stuff['existing_images'] = pei
 
     def run_once(self):
         super(build_base, self).run_once()

subtests/docker_cli/build/full/Dockerfile

@@ -1,4 +1,4 @@
-FROM stackbrew/centos:centos7
+FROM stackbrew/centos:7
 MAINTAINER [email protected]
 ENV PATH /usr/sbin:/usr/bin
 RUN echo "Schazam!"