freshmaker

Clone

#15 Rebuild docker image when Dockerfile is changed
Merged 8 years ago by cqi. Opened 8 years ago by cqi.
cqi/freshmaker rebuild-docker-image-when-dockerfile-changed  into  master

file modified
+1 
@@ -5,3 +5,4 @@ 
 

  /build/
 

  /dist/
 

  /freshmaker.egg-info/
 

+ *swp

file modified
+14 
@@ -33,6 +33,7 @@ 
 

      # List of enabled composing handlers.
 

      HANDLERS = [
 

          "freshmaker.handlers.mbs:MBS",  # Module Build Service
 

+         "freshmaker.handlers.image_builder:DockerImageRebuildHandler",
 

      ]
 

  

      # Base URL of git repository with source artifacts.
 
@@ -44,6 +45,15 @@ 
 

      # Authorization token to use when communicating with MBS.
 

      MBS_AUTH_TOKEN = ""
 

  

+     # Read Koji configuration from profile instead of reading them from
 

+     # configuration file directly. For staging Koji, it is stg.
 

+     KOJI_PROFILE = 'koji'
 

+     KOJI_PROXYUSER = False
 

+     KOJI_BUILD_OWNER = 'freshmaker'
 

+ 

+     # Settings for docker image rebuild handler
 

+     KOJI_CONTAINER_SCRATCH_BUILD = False
 

+ 

  

  class DevConfiguration(BaseConfiguration):
 

      DEBUG = True
 
@@ -56,6 +66,8 @@ 
 

      NET_TIMEOUT = 5
 

      NET_RETRY_INTERVAL = 1
 

  

+     KOJI_CONTAINER_SCRATCH_BUILD = True
 

+ 

  

  class TestConfiguration(BaseConfiguration):
 

      LOG_BACKEND = 'console'
 
@@ -69,6 +81,8 @@ 
 

      NET_RETRY_INTERVAL = 1
 

      MBS_AUTH_TOKEN = "testingtoken"
 

  

+     KOJI_CONTAINER_SCRATCH_BUILD = True
 

+ 

  

  class ProdConfiguration(BaseConfiguration):
 

      pass

file modified
+16 
@@ -147,6 +147,22 @@ 
 

              'type': str,
 

              'default': '',
 

              'desc': "OpenIDC token to use when communicating with MBS."},
 

+         'koji_profile': {
 

+             'type': str,
 

+             'default': 'koji',
 

+             'desc': 'Koji Profile from where to load Koji configuration.'},
 

+         'koji_proxyuser': {
 

+             'type': bool,
 

+             'default': True,
 

+             'desc': 'Koji proxyuser flag.'},
 

+         'koji_container_scratch_build': {
 

+             'type': bool,
 

+             'default': False,
 

+             'desc': 'Whether to make a scratch build to rebuild the image.'},
 

+         'koji_build_owner': {
 

+             'type': str,
 

+             'default': '',
 

+             'desc': 'Build owner.'},
 

      }
 

  

      def __init__(self, conf_section_obj):

file modified
+12 
@@ -153,3 +153,15 @@ 
 

      """
 

      def __init__(self, msg_id):
 

          super(TestingEvent, self).__init__(msg_id)
 

+ 

+ 

+ class DockerfileChanged(BaseEvent):
 

+     """Represent the message omitted when Dockerfile is changed in a push"""
 

+ 

+     def __init__(self, msg_id, repo_url, namespace, repo, branch, rev):
 

+         super(DockerfileChanged, self).__init__(msg_id)
 

+         self.repo_url = repo_url
 

+         self.branch = branch
 

+         self.namespace = namespace
 

+         self.repo = repo
 

+         self.rev = rev

file added
+84 
@@ -0,0 +1,84 @@ 
 

+ # -*- coding: utf-8 -*-
 

+ # Copyright (c) 2017  Red Hat, Inc.
 

+ #
 

+ # Permission is hereby granted, free of charge, to any person obtaining a copy
 

+ # of this software and associated documentation files (the "Software"), to deal
 

+ # in the Software without restriction, including without limitation the rights
 

+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 

+ # copies of the Software, and to permit persons to whom the Software is
 

+ # furnished to do so, subject to the following conditions:
 

+ #
 

+ # The above copyright notice and this permission notice shall be included in
 

+ # all copies or substantial portions of the Software.
 

+ #
 

+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 

+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 

+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 

+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 

+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 

+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 

+ # SOFTWARE.
 

+ #
 

+ # Written by Chenxiong Qi <cqi@redhat.com>
 

+ 

+ from freshmaker import log, conf
 

+ from freshmaker.handlers import BaseHandler
 

+ from freshmaker.events import DockerfileChanged
 

+ 

+ 

+ class DockerImageRebuildHandler(BaseHandler):
 

+ 

+     def can_handle(self, event):
 

+         return isinstance(event, DockerfileChanged)
 

+ 

+     def handle(self, event):
 

+         """Rebuild docker image"""
 

+         self.build_image(event)
 

+ 

+     def build_image(self, event):
 

+         import koji
 

+ 

+         config = koji.read_config(conf.koji_profile)
 

+         koji_server = config['server']
 

+ 

+         session = koji.ClientSession(koji_server, {'krb_rdns': config['krb_rdns']})
 

+ 

+         log.debug('Logging into {0} with Kerberos authentication.'.format(koji_server))
 

+         proxyuser = conf.koji_build_owner if conf.koji_proxyuser else None
 

+ 

+         try:
 

+             session.krb_login(proxyuser=proxyuser)
 

+         except Exception as e:
 

+             log.error('Failed to login Koji via Kerberos using GSSAPI')
 

+             log.error('Error message from Koji: %s', e)
 

+             return
 

+ 

+         if not session.logged_in:
 

+             log.error('Could not login server %s', koji_server)
 

+             return
 

+ 

+         build_opts = {
 

+             'scratch': conf.koji_container_scratch_build,
 

+             'git_branch': event.branch,
 

+         }
 

+ 

+         try:
 

+             build_target = '{}-{}-candidate'.format(
 

+                 'rawhide' if event.branch == 'master' else event.branch,
 

+                 event.namespace)
 

+             build_source = '{}#{}'.format(event.repo_url, event.rev)
 

+ 

+             log.info('Start to build docker image %s', event.repo)
 

+             log.debug('Build from source: %s', build_source)
 

+             log.debug('Build in target: %s', build_target)
 

+             log.debug('Build options: %s', build_opts)
 

+ 

+             task_id = session.buildContainer(build_source, build_target, build_opts)
 

+         except Exception as e:
 

+             log.exception('Could not create task to build docker image %s', event.repo)
 

+         else:
 

+             log.info('Task %s is created to build docker image for repo %s', task_id, event.repo)
 

+             log.info('Task info: %s/taskinfo?taskID=%s', config['weburl'], task_id)
 

+         finally:
 

+             log.debug('Logout Koji session')
 

+             session.logout()

file modified
+13 
@@ -24,6 +24,7 @@ 
 

  from freshmaker import log, conf
 

  from freshmaker.parsers import BaseParser
 

  from freshmaker.events import ModuleMetadataUpdated
 

+ from freshmaker.events import DockerfileChanged
 

  

  

  class GitReceiveParser(BaseParser):
 
@@ -60,10 +61,22 @@ 
 

          branch = commit.get("branch")
 

  

          log.debug(namespace)
 

+ 

          if namespace == "modules":
 

              scm_url = "%s/%s/%s.git?#%s" % (conf.git_base_url, namespace, repo, rev)
 

              log.debug("Parsed ModuleMetadataUpdated fedmsg, scm_url=%s, "
 

                        "branch=%s", scm_url, branch)
 

              return ModuleMetadataUpdated(msg_id, scm_url, branch)
 

  

+         elif namespace == 'container':
 

+             changed_files = msg['msg']['commit']['stats']['files']
 

+             if 'Dockerfile' not in changed_files:
 

+                 log.debug('Dockerfile is not changed in repo {}'.format(repo))
 

+                 return None
 

+ 

+             log.debug('Parsed DockerfileChanged fedmsg')
 

+             repo_url = '{}/{}/{}.git'.format(conf.git_base_url, namespace, repo)
 

+             return DockerfileChanged(msg_id, repo_url=repo_url, branch=branch,
 

+                                      namespace=namespace, repo=repo, rev=rev)
 

+ 

          return None

file added
+46 
@@ -0,0 +1,46 @@ 
 

+ {
 

+   "source_name": "datanommer", 

+   "certificate": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVTRENDQTdHZ0F3SUJBZ0lDQWVBd0RRWUpL\nb1pJaHZjTkFRRUZCUUF3Z2FBeEN6QUpCZ05WQkFZVEFsVlQKTVFzd0NRWURWUVFJRXdKT1F6RVFN\nQTRHQTFVRUJ4TUhVbUZzWldsbmFERVhNQlVHQTFVRUNoTU9SbVZrYjNKaApJRkJ5YjJwbFkzUXhE\nekFOQmdOVkJBc1RCbVpsWkcxelp6RVBNQTBHQTFVRUF4TUdabVZrYlhObk1ROHdEUVlEClZRUXBF\nd1ptWldSdGMyY3hKakFrQmdrcWhraUc5dzBCQ1FFV0YyRmtiV2x1UUdabFpHOXlZWEJ5YjJwbFkz\nUXUKYjNKbk1CNFhEVEUxTURJeE5qRXpOREkxTmxvWERUSTFNREl4TXpFek5ESTFObG93Z2RZeEN6\nQUpCZ05WQkFZVApBbFZUTVFzd0NRWURWUVFJRXdKT1F6RVFNQTRHQTFVRUJ4TUhVbUZzWldsbmFE\nRVhNQlVHQTFVRUNoTU9SbVZrCmIzSmhJRkJ5YjJwbFkzUXhEekFOQmdOVkJBc1RCbVpsWkcxelp6\nRXFNQ2dHQTFVRUF4TWhjMk50TFhCclozTXcKTWk1d2FIZ3lMbVpsWkc5eVlYQnliMnBsWTNRdWIz\nSm5NU293S0FZRFZRUXBFeUZ6WTIwdGNHdG5jekF5TG5CbwplREl1Wm1Wa2IzSmhjSEp2YW1WamRD\nNXZjbWN4SmpBa0Jna3Foa2lHOXcwQkNRRVdGMkZrYldsdVFHWmxaRzl5CllYQnliMnBsWTNRdWIz\nSm5NSUdmTUEwR0NTcUdTSWIzRFFFQkFRVUFBNEdOQURDQmlRS0JnUURFVGdMSDFGRkQKRnRHdDNE\nVjdzTFJVRFluaVJnaW1HRTZ4eWRLNWhaUGlIUEJPMk5pUVNUcVVjbVdLVVV2Y1NKV25XR1gvRUdJ\nQQpDMFA5MDJCd1VWSk9sZVdkWXI4dGUrZW4wYVdUbVh5QTJPRVMyOUhOL0tPNEFNRnM3RUk1aEdZ\nYUFpbitNUWI5CjhpSnh3Z0JvR1JkZ1BvNVNrdW1NRWVyUjVXR2paM2U3aVFJREFRQUJvNElCVnpD\nQ0FWTXdDUVlEVlIwVEJBSXcKQURBdEJnbGdoa2dCaHZoQ0FRMEVJQlllUldGemVTMVNVMEVnUjJW\ndVpYSmhkR1ZrSUVObGNuUnBabWxqWVhSbApNQjBHQTFVZERnUVdCQlI0eDUvSDJxWXlZaTNIa1k4\nNmEyL2hHcWlBUGpDQjFRWURWUjBqQklITk1JSEtnQlJyClFGcjVFZ2lKV2VkWjVRWDFBaDBLVG44\nVUFLR0JwcVNCb3pDQm9ERUxNQWtHQTFVRUJoTUNWVk14Q3pBSkJnTlYKQkFnVEFrNURNUkF3RGdZ\nRFZRUUhFd2RTWVd4bGFXZG9NUmN3RlFZRFZRUUtFdzVHWldSdmNtRWdVSEp2YW1WagpkREVQTUEw\nR0ExVUVDeE1HWm1Wa2JYTm5NUTh3RFFZRFZRUURFd1ptWldSdGMyY3hEekFOQmdOVkJDa1RCbVps\nClpHMXpaekVtTUNRR0NTcUdTSWIzRFFFSkFSWVhZV1J0YVc1QVptVmtiM0poY0hKdmFtVmpkQzV2\nY21lQ0NRRGoKVUI1SFR4Y2VSVEFUQmdOVkhTVUVEREFLQmdnckJnRUZCUWNEQWpBTEJnTlZIUThF\nQkFNQ0I0QXdEUVlKS29aSQpodmNOQVFFRkJRQURnWUVBbVFBOGxXQW1DMi9lUVpNeFpWTnVNZ1I4\ndlV6cnZBVndOOVh0NUh6KzloMTRNV2hSCm12SldSYlZwYUtGaE1OME0xV3U0YjMvWkJOMS9nT2w2\nK2dnelpxdXVYYmQxZHBGcHo5OUNuQWg2QVYyVUpPZ2wKaTRVaU5lbTB4cndRRXZqU29CZTUrVG1L\nM0srSjZnV2laQVVPQWR0dXNYT0JRKzY2RHY5NkxuVTlMSzg9Ci0tLS0tRU5EIENFUlRJRklDQVRF\nLS0tLS0K\n", 

+   "i": 1, 

+   "timestamp": 1490703272.0, 

+   "msg_id": "2017-9fef6790-55df-4bbc-aa25-275e0e3ef892", 

+   "topic": "org.fedoraproject.prod.git.receive", 

+   "source_version": "0.6.5", 

+   "signature": "uHM2uRSrm9Pwbpyv2xxs/V4tBkmYTE8njqVzGFojib6ekmJBEHrX+SLoMC/F3VMd5S8ob8vCTvBM\nfBHL5BEsns+tACYwdGAvyqCVwiXw41mP3bOiOfusb3agIr8g/4WzMAePSEqu1mOnu97kf3Z+eex6\nin5k3anbeH71Pp599Nc=\n", 

+   "msg": {
 

+     "commit": {
 

+       "username": "jkaluza", 

+       "stats": {
 

+         "files": {
 

+           "Dockerfile": {
 

+             "deletions": 1, 

+             "additions": 5, 

+             "lines": 6
 

+           },
 

+           "httpd.conf": {
 

+             "deletions": 4, 

+             "additions": 0, 

+             "lines": 4
 

+           }
 

+         }, 

+         "total": {
 

+           "deletions": 4, 

+           "files": 1, 

+           "additions": 0, 

+           "lines": 4
 

+         }
 

+       }, 

+       "name": "Jan Kaluza", 

+       "rev": "e1f39d43471fc37ec82616f76a119da4eddec787", 

+       "namespace": "container",
 

+       "agent": "jkaluza", 

+       "summary": "bump", 

+       "repo": "testimage", 

+       "branch": "master", 

+       "seen": false, 

+       "path": "/srv/git/repositories/dockers/testimage.git", 

+       "message": "bump\n", 

+       "email": "jkaluza@redhat.com"
 

+     }
 

+   }
 

+ }

file added
+41 
@@ -0,0 +1,41 @@ 
 

+ {
 

+   "source_name": "datanommer", 

+   "certificate": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVTRENDQTdHZ0F3SUJBZ0lDQWVBd0RRWUpL\nb1pJaHZjTkFRRUZCUUF3Z2FBeEN6QUpCZ05WQkFZVEFsVlQKTVFzd0NRWURWUVFJRXdKT1F6RVFN\nQTRHQTFVRUJ4TUhVbUZzWldsbmFERVhNQlVHQTFVRUNoTU9SbVZrYjNKaApJRkJ5YjJwbFkzUXhE\nekFOQmdOVkJBc1RCbVpsWkcxelp6RVBNQTBHQTFVRUF4TUdabVZrYlhObk1ROHdEUVlEClZRUXBF\nd1ptWldSdGMyY3hKakFrQmdrcWhraUc5dzBCQ1FFV0YyRmtiV2x1UUdabFpHOXlZWEJ5YjJwbFkz\nUXUKYjNKbk1CNFhEVEUxTURJeE5qRXpOREkxTmxvWERUSTFNREl4TXpFek5ESTFObG93Z2RZeEN6\nQUpCZ05WQkFZVApBbFZUTVFzd0NRWURWUVFJRXdKT1F6RVFNQTRHQTFVRUJ4TUhVbUZzWldsbmFE\nRVhNQlVHQTFVRUNoTU9SbVZrCmIzSmhJRkJ5YjJwbFkzUXhEekFOQmdOVkJBc1RCbVpsWkcxelp6\nRXFNQ2dHQTFVRUF4TWhjMk50TFhCclozTXcKTWk1d2FIZ3lMbVpsWkc5eVlYQnliMnBsWTNRdWIz\nSm5NU293S0FZRFZRUXBFeUZ6WTIwdGNHdG5jekF5TG5CbwplREl1Wm1Wa2IzSmhjSEp2YW1WamRD\nNXZjbWN4SmpBa0Jna3Foa2lHOXcwQkNRRVdGMkZrYldsdVFHWmxaRzl5CllYQnliMnBsWTNRdWIz\nSm5NSUdmTUEwR0NTcUdTSWIzRFFFQkFRVUFBNEdOQURDQmlRS0JnUURFVGdMSDFGRkQKRnRHdDNE\nVjdzTFJVRFluaVJnaW1HRTZ4eWRLNWhaUGlIUEJPMk5pUVNUcVVjbVdLVVV2Y1NKV25XR1gvRUdJ\nQQpDMFA5MDJCd1VWSk9sZVdkWXI4dGUrZW4wYVdUbVh5QTJPRVMyOUhOL0tPNEFNRnM3RUk1aEdZ\nYUFpbitNUWI5CjhpSnh3Z0JvR1JkZ1BvNVNrdW1NRWVyUjVXR2paM2U3aVFJREFRQUJvNElCVnpD\nQ0FWTXdDUVlEVlIwVEJBSXcKQURBdEJnbGdoa2dCaHZoQ0FRMEVJQlllUldGemVTMVNVMEVnUjJW\ndVpYSmhkR1ZrSUVObGNuUnBabWxqWVhSbApNQjBHQTFVZERnUVdCQlI0eDUvSDJxWXlZaTNIa1k4\nNmEyL2hHcWlBUGpDQjFRWURWUjBqQklITk1JSEtnQlJyClFGcjVFZ2lKV2VkWjVRWDFBaDBLVG44\nVUFLR0JwcVNCb3pDQm9ERUxNQWtHQTFVRUJoTUNWVk14Q3pBSkJnTlYKQkFnVEFrNURNUkF3RGdZ\nRFZRUUhFd2RTWVd4bGFXZG9NUmN3RlFZRFZRUUtFdzVHWldSdmNtRWdVSEp2YW1WagpkREVQTUEw\nR0ExVUVDeE1HWm1Wa2JYTm5NUTh3RFFZRFZRUURFd1ptWldSdGMyY3hEekFOQmdOVkJDa1RCbVps\nClpHMXpaekVtTUNRR0NTcUdTSWIzRFFFSkFSWVhZV1J0YVc1QVptVmtiM0poY0hKdmFtVmpkQzV2\nY21lQ0NRRGoKVUI1SFR4Y2VSVEFUQmdOVkhTVUVEREFLQmdnckJnRUZCUWNEQWpBTEJnTlZIUThF\nQkFNQ0I0QXdEUVlKS29aSQpodmNOQVFFRkJRQURnWUVBbVFBOGxXQW1DMi9lUVpNeFpWTnVNZ1I4\ndlV6cnZBVndOOVh0NUh6KzloMTRNV2hSCm12SldSYlZwYUtGaE1OME0xV3U0YjMvWkJOMS9nT2w2\nK2dnelpxdXVYYmQxZHBGcHo5OUNuQWg2QVYyVUpPZ2wKaTRVaU5lbTB4cndRRXZqU29CZTUrVG1L\nM0srSjZnV2laQVVPQWR0dXNYT0JRKzY2RHY5NkxuVTlMSzg9Ci0tLS0tRU5EIENFUlRJRklDQVRF\nLS0tLS0K\n", 

+   "i": 1, 

+   "timestamp": 1490703272.0, 

+   "msg_id": "2017-9fef6790-55df-4bbc-aa25-275e0e3ef892", 

+   "topic": "org.fedoraproject.prod.git.receive", 

+   "source_version": "0.6.5", 

+   "signature": "uHM2uRSrm9Pwbpyv2xxs/V4tBkmYTE8njqVzGFojib6ekmJBEHrX+SLoMC/F3VMd5S8ob8vCTvBM\nfBHL5BEsns+tACYwdGAvyqCVwiXw41mP3bOiOfusb3agIr8g/4WzMAePSEqu1mOnu97kf3Z+eex6\nin5k3anbeH71Pp599Nc=\n", 

+   "msg": {
 

+     "commit": {
 

+       "username": "jkaluza", 

+       "stats": {
 

+         "files": {
 

+           "httpd.conf": {
 

+             "deletions": 4, 

+             "additions": 0, 

+             "lines": 4
 

+           }
 

+         }, 

+         "total": {
 

+           "deletions": 4, 

+           "files": 1, 

+           "additions": 0, 

+           "lines": 4
 

+         }
 

+       }, 

+       "name": "Jan Kaluza", 

+       "rev": "e1f39d43471fc37ec82616f76a119da4eddec787", 

+       "namespace": "container",
 

+       "agent": "jkaluza", 

+       "summary": "bump", 

+       "repo": "testimage", 

+       "branch": "master", 

+       "seen": false, 

+       "path": "/srv/git/repositories/dockers/testimage.git", 

+       "message": "bump\n", 

+       "email": "jkaluza@redhat.com"
 

+     }
 

+   }
 

+ }

file added
+96 
@@ -0,0 +1,96 @@ 
 

+ # Copyright (c) 2017  Red Hat, Inc.
 

+ #
 

+ # Permission is hereby granted, free of charge, to any person obtaining a copy
 

+ # of this software and associated documentation files (the "Software"), to deal
 

+ # in the Software without restriction, including without limitation the rights
 

+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 

+ # copies of the Software, and to permit persons to whom the Software is
 

+ # furnished to do so, subject to the following conditions:
 

+ #
 

+ # The above copyright notice and this permission notice shall be included in all
 

+ # copies or substantial portions of the Software.
 

+ #
 

+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 

+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 

+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 

+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 

+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 

+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 

+ # SOFTWARE.
 

+ #
 

+ # Written by Chenxiong Qi <cqi@redhat.com>
 

+ 

+ import fedmsg.config
 

+ import pytest
 

+ import six
 

+ import unittest
 

+ 

+ from mock import patch
 

+ from mock import MagicMock
 

+ from freshmaker.consumer import FreshmakerConsumer
 

+ from tests import get_fedmsg
 

+ 

+ 

+ @pytest.mark.skipif(six.PY3, reason='koji does not work in Python 3')
 

+ class TestImageBuilderHandler(unittest.TestCase):
 

+ 

+     def create_consumer(self):
 

+         hub = MagicMock()
 

+         hub.config = fedmsg.config.load_config()
 

+         return FreshmakerConsumer(hub)
 

+ 

+     @patch("requests.request")
 

+     @patch('freshmaker.consumer.get_global_consumer')
 

+     def consume_git_receive_msg(self, msg, global_consumer, request):
 

+         consumer = self.create_consumer()
 

+         global_consumer.return_value = consumer
 

+         consumer.consume(msg)
 

+ 

+     @patch('koji.read_config')
 

+     @patch('koji.ClientSession')
 

+     def test_rebuild_if_Dockerfile_changed(self, ClientSession, read_config):
 

+         read_config.return_value = {
 

+             'server': 'https://localhost/kojihub',
 

+             'krb_rdns': False,
 

+         }
 

+ 

+         self.consume_git_receive_msg(get_fedmsg("git_receive_dockerfile_changed"))
 

+ 

+         mock_session = ClientSession.return_value
 

+         mock_session.krb_login.assert_called_once_with(proxyuser=None)
 

+         mock_session.buildContainer.assert_called_once_with(
 

+             'git://pkgs.fedoraproject.org/container/testimage.git#e1f39d43471fc37ec82616f76a119da4eddec787',
 

+             'rawhide-container-candidate',
 

+             {'scratch': True, 'git_branch': 'master'})
 

+         mock_session.logout.assert_called_once()
 

+ 

+     @patch('freshmaker.handlers.image_builder.DockerImageRebuildHandler.build_image')
 

+     def test_not_rebuild_if_Dockerfile_not_changed(self, build_image):
 

+         self.consume_git_receive_msg(get_fedmsg("git_receive_dockerfile_not_changed"))
 

+         build_image.assert_not_called()
 

+ 

+     @patch('koji.read_config')
 

+     @patch('koji.ClientSession')
 

+     def test_ensure_logout_in_whatever_case(self, ClientSession, read_config):
 

+         ClientSession.return_value.buildContainer.side_effect = RuntimeError
 

+         read_config.return_value = {
 

+             'server': 'https://localhost/kojihub',
 

+             'krb_rdns': False,
 

+         }
 

+ 

+         self.consume_git_receive_msg(get_fedmsg("git_receive_dockerfile_changed"))
 

+ 

+         ClientSession.return_value.logout.assert_called_once()
 

+ 

+     @patch('koji.read_config')
 

+     @patch('koji.ClientSession')
 

+     def test_ensure_do_nothing_if_fail_to_login_koji(self, ClientSession, read_config):
 

+         ClientSession.return_value.krb_login.side_effect = RuntimeError
 

+         read_config.return_value = {
 

+             'server': 'https://localhost/kojihub',
 

+             'krb_rdns': False,
 

+         }
 

+ 

+         self.consume_git_receive_msg(get_fedmsg("git_receive_dockerfile_changed"))
 

+ 

+         ClientSession.return_value.buildContainer.assert_not_called()

file modified
+2 -1 
@@ -8,6 +8,7 @@ 
 

  

  [testenv]
 

  deps = pytest
 

+ sitepackages = True
 

  commands = py.test {posargs}
 

  

  [testenv:coverage]
 
@@ -18,7 +19,7 @@ 
 

  commands =
 

      coverage run --parallel-mode -m pytest
 

      coverage combine
 

-     coverage report --omit=.tox/* -m --skip-covered
 

+     coverage report --include="freshmaker/*.py,fedmsg.d/*.py" --omit=.tox/* -m --skip-covered

+1, we have to do that fo MBS too :)

 
  

  [testenv:flake8]
 

  basepython = python3

freshmaker is able to build a docker image when changed Dockerfile is
detected. freshmaker listens on fedmsg bus and handles message from
topic git.receive. When Dockerfile is changed, freshmaker will start to
build docker image in Koji immediately. Note that, freshmaker does not
wait for the task to finish, it continues to handle next coming message
instead.

Signed-off-by: Chenxiong Qi cqi@redhat.com

rebased
8 years ago

rebased
8 years ago

+1, we have to do that fo MBS too :)

Your call, but you might be able to remove both of the log.error lines and replace them with a single line:

log.exception("Could not create task to build docker image %s', event.repo)

This will print the stacketrace, the exception message and your custom message.

I find this nice as a sysadmin+dev to be able to see the real traceback which caused the error in addition to the human-friendly explanation of what went wrong.

Looks good to me in general. :+1:

+1

rebased
8 years ago

Update:

  • use log.exception in exception handler
  • rebase on master branch
  • ignore *swp files

still +1, feel free to merge if you are OK with the PR yourself :)

Pull-Request has been merged by cqi
8 years ago
Changes Summary 10
+1 -0
file changed
.gitignore
+14 -0
file changed
conf/config.py
+16 -0
file changed
freshmaker/config.py
+12 -0
file changed
freshmaker/events.py
+84
file added
freshmaker/handlers/image_builder.py
+13 -0
file changed
freshmaker/parsers/gitreceive.py
+46
file added
tests/fedmsgs/git_receive_dockerfile_changed
+41
file added
tests/fedmsgs/git_receive_dockerfile_not_changed
+96
file added
tests/handlers/test_image_builder.py
+2 -1
file changed
tox.ini
Powered by Pagure 5.14.1
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.