Merge pull request #41 from totem/develop

0.3.7 Release

Author: sukrit007

conf/appconfig.py

@@ -219,6 +219,7 @@
 HOOK_TYPE_CI = 'ci'
 HOOK_TYPE_BUILDER = 'builder'
 HOOK_TYPE_SCM_PUSH = 'scm-push'
+HOOK_TYPE_SCM_CREATE = 'scm-create'
 
 # Store Settings
 DEFAULT_STORE_NAME = 'mongo'

dev-requirements.txt

@@ -7,4 +7,6 @@ Sphinx==1.2.3
 freezegun==0.2.8
 
 # Code Coverage
-coveralls
+coveralls
+
+flower==0.7.2

orchestrator/__init__.py

@@ -2,7 +2,7 @@
 from celery.signals import setup_logging
 import orchestrator.logger
 
-__version__ = '0.3.6'
+__version__ = '0.3.7'
 __author__ = 'sukrit'
 
 orchestrator.logger.init_logging()

orchestrator/services/job.py

@@ -168,10 +168,7 @@ def create_job(job_config, owner, repo, ref, commit=None, force_deploy=False,
         state_in=[JOB_STATE_NEW, JOB_STATE_SCHEDULED])
     if existing_jobs:
         job = existing_jobs[0]
-        if not commit:
-            job = reset_hook_status(job)
-            job['config'] = job_config
-        elif commit not in job['meta-info']['git']['commit-set']:
+        if commit and commit not in job['meta-info']['git']['commit-set']:
             job['meta-info']['git']['commit-set'].append(commit)
             job['meta-info']['git']['commit'] = commit
             job = reset_hook_status(job)

orchestrator/tasks/job.py

@@ -349,15 +349,13 @@ def _handle_hook(job, hook_type, hook_name, hook_status, hook_result,
                                          git_meta['ref'], False)
         store.add_event(EVENT_SETUP_APPLICATION_COMPLETE,
                         search_params=search_params)
-        # Even though we unfreeze the application, we will consider this
-        #  job to be noop as no deployment will be created.
-        noop = True
+        frozen = False
     else:
-        noop = job_service.is_frozen(git_meta['owner'], git_meta['repo'],
-                                     git_meta['ref'])
+        frozen = job_service.is_frozen(git_meta['owner'], git_meta['repo'],
+                                       git_meta['ref'])
 
     if not job_config['enabled'] or not builder_hooks or \
-            not job_config['deployers'] or noop:
+            not job_config['deployers'] or frozen:
         return _handle_noop(job)
 
     job = prepare_job(job, hook_type, hook_name, hook_status, hook_result,

orchestrator/views/hooks.py

@@ -171,15 +171,19 @@ def post(self, request_data=None, **kwargs):
                 not request_data.get('deleted'):
             ref = basename(request_data['ref'])
             commit = request_data['after']
-            task = handle_callback_hook.delay(
-                owner, repo, ref, 'scm-push', 'github-push', commit=commit)
+            # Delay processing of github push event ( eventual consistency)
+            task = handle_callback_hook.apply_async(
+                (owner, repo, ref, 'scm-push', 'github-push'),
+                kwargs={'commit': commit}, countdown=10)
             return created_task(task)
         elif request.headers.get('X-GitHub-Event') == 'create' and \
                 request_data.get('ref_type') == 'branch' and \
                 request_data.get('ref'):
             ref = basename(request_data['ref'])
-            task = handle_callback_hook.delay(
-                owner, repo, ref, 'scm-create', 'github-create')
+            # Delay processing of github create event ( eventual consistency)
+            task = handle_callback_hook.apply_async(
+                (owner, repo, ref, 'scm-create', 'github-create'),
+                countdown=10)
             return created_task(task)
         else:
             # Ignore all other hooks

requirements.txt

@@ -7,7 +7,6 @@ future==0.15.0
 PyYAML==3.11
 boto==2.34.0
 pymongo==3.0.3
-flower==0.7.2
 Jinja2==2.7.3
 requests[security]==2.7.0
 urllib3==1.11

tests/unit/orchestrator/services/test_job.py

@@ -307,7 +307,7 @@ def test_create_job_when_exists_with_no_commit_info(m_get_store):
         'hooks': {
             'ci': {
                 'ci1': {
-                    'status': HOOK_STATUS_PENDING
+                    'status': HOOK_STATUS_SUCCESS
                 }
             },
             'builder': {

tests/unit/orchestrator/views/test_hooks.py

@@ -223,9 +223,9 @@ def test_post_for_create_branch_event(self, m_handle_callback_hook):
 
         # Then: Expected response is returned
         eq_(resp.status_code, 202)
-        m_handle_callback_hook.delay.assert_called_once_with(
-            u'mock_owner', u'mock_repo', u'develop', u'scm-create',
-            u'github-create')
+        m_handle_callback_hook.apply_async.assert_called_once_with(
+            (u'mock_owner', u'mock_repo', u'develop', u'scm-create',
+             u'github-create'), countdown=10)
 
     @patch('orchestrator.views.hooks.handle_callback_hook')
     def test_post_for_create_non_branch_event(self, m_handle_callback_hook):