From 5321ae28376aeb363d88456c6726bf32f357e603 Mon Sep 17 00:00:00 2001 From: Michal Migurski Date: Wed, 1 Mar 2017 14:28:00 -0800 Subject: [PATCH 1/2] Added MACHINE_BASE_URL configuration option --- chef/data/local.json | 3 +++ chef/webhooks/recipes/default.rb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/chef/data/local.json b/chef/data/local.json index c8cd206c..a59da5e5 100644 --- 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 index 95693f89..70be841f 100644 --- 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 From 5e663113f8c4d24708a68b6abc6d5cdc3ffe20e4 Mon Sep 17 00:00:00 2001 From: Michal Migurski Date: Wed, 1 Mar 2017 14:33:26 -0800 Subject: [PATCH 2/2] Added job URL output to comments --- openaddr/ci/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openaddr/ci/__init__.py b/openaddr/ci/__init__.py index 4218e724..8392db09 100644 --- 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'})