Merge pull request #568 from openaddresses/migurski/add-slippymap-to-…

…status-comments Add slippymap preview URL to status comments
openaddresses · Mar 1, 2017 · 7a68927 · 7a68927
2 parents accb42b + 5e66311
commit 7a68927
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/chef/data/local.json b/chef/data/local.json
@@ -22,6 +22,9 @@
     "mapbox_key": "{Mapbox Key}",
     "mapzen_key": "{Mapzen Key}",
     "gag_github_status": "No",
+    "reject_new_jobs": "No",
+    "dotmaps_base_url": "{URL}",
+    "machine_base_url": "{URL}",
 
     "worker_kind": null,
     "web_docroot": "/var/www/html",

diff --git a/chef/webhooks/recipes/default.rb b/chef/webhooks/recipes/default.rb
@@ -11,6 +11,7 @@
 aws_sns_arn = local['aws_sns_arn']
 aws_cloudwatch_ns = local['aws_cloudwatch_ns']
 dotmaps_base_url = local['dotmaps_base_url']
+machine_base_url = local['machine_base_url']
 webhook_secrets = local['webhook_secrets']
 
 gag_github_status = local['gag_github_status']
@@ -43,6 +44,7 @@
 AWS_CLOUDWATCH_NS=#{aws_cloudwatch_ns}
 AWS_S3_BUCKET=#{aws_s3_bucket}
 DOTMAPS_BASE_URL=#{dotmaps_base_url}
+MACHINE_BASE_URL=#{machine_base_url}
 WEBHOOK_SECRETS=#{webhook_secrets}
 LC_ALL=C.UTF-8
 CONF

diff --git a/openaddr/ci/__init__.py b/openaddr/ci/__init__.py
@@ -861,6 +861,9 @@ def update_job_comments(db, job_id, run_id, github_auth):
             return
 
     comment_json = {'body': '![Preview]({})'.format(run.state.preview)}
+    if 'MACHINE_BASE_URL' in os.environ:
+        job_url = urljoin(os.environ['MACHINE_BASE_URL'], '/jobs/{}'.format(job_id))
+        comment_json['body'] = '{body}\n\nMore: {}'.format(job_url, **comment_json)
     posted = post(job.github_comments_url, data=json.dumps(comment_json), auth=github_auth,
                   headers={'Content-Type': 'application/json'})