Merge lp:~jcsackett/charms/precise/charmworld/add-jenkins into lp:~juju-jitsu/charms/precise/charmworld/trunk

[j.c.sackett]

Add necessary config options for triggering jenkins test builds of ingested charms.

This branch adds the jenkins ini file options for charmworld to the config, and updates the config generation to include them in building production.ini

This cannot be landed until https://code.launchpad.net/~jcsackett/charmworld/trigger-test-builds/+merge/201466 lands.

[lp:~jcsackett/charms/precise/charmworld/add-jenkins]

91. By j.c.sackett on 2014-01-14

Fixed bad overrides.ini

92. By j.c.sackett on 2014-01-14

Remove remaining bad jenkins references.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2014-01-07 18:39:21 +0000
+++ config.yaml	2014-01-14 16:32:34 +0000
@@ -56,3 +56,18 @@
     default: ''
     description: |
       The lp credentials to use with charmworld ingest, if available.
+  charm_testing_url:
+    type: string
+    default: ''
+    description: | 
+      The url of the testing service (e.g. jenkins) used for charm testing
+  charm_testing_token:
+    type: string
+    default: ''
+    description: |
+      The token needed for triggering builds
+  charm_testing_job:
+    type: string
+    default: ''
+    description: |
+      The name of the job running the test.

=== modified file 'production_overrides.ini'
--- production_overrides.ini	2014-01-07 18:39:21 +0000
+++ production_overrides.ini	2014-01-14 16:32:34 +0000
@@ -7,6 +7,9 @@
 mongo.url =
 lp_credentials_file = /home/webops_deploy/charmworld/charmbot_credentials.txt
 proof.port = 6543
+charm_testing_url =
+charm_testing_token =
+charm_testing_job =
 
 [server:main]
 port = 6543

=== modified file 'scripts/write_config.py'
--- scripts/write_config.py	2014-01-02 14:19:13 +0000
+++ scripts/write_config.py	2014-01-14 16:32:34 +0000
@@ -21,7 +21,8 @@
 
 def write_new_config(mongo_url, es_url, error_handler, charm_import_limit,
                      worker_interval, default, override, target, es_replicas,
-                     es_shards):
+                     es_shards, charm_testing_url, charm_testing_token,
+                     charm_testing_job):
     new_config = read_config([default, override])
     new_config.set('app:main', 'mongo.url', mongo_url)
     new_config.set('app:main', 'es_urls', es_url)
@@ -45,6 +46,9 @@
         'app:main', 'worker_interval', worker_interval)
     new_config.set('app:main', 'es_replicas', es_replicas)
     new_config.set('app:main', 'es_shards', es_shards)
+    new_config.set('app:main', 'charm_testing_url', charm_testing_url)
+    new_config.set('app:main', 'charm_testing_token', charm_testing_token)
+    new_config.set('app:main', 'charm_testing_job', charm_testing_job)
     with open(target, 'w') as output:
         new_config.write(output)
 
@@ -132,12 +136,18 @@
     worker_interval = juju_config['worker-interval']
     es_shards = juju_config['es_shards']
     es_replicas = juju_config['es_replicas']
+    charm_testing_url = juju_config['charm_testing_url']
+    charm_testing_token = juju_config['charm_testing_token']
+    charm_testing_job = juju_config['charm_testing_job']
 
     write_new_config(get_mongo_url(), get_elasticsearch_url(),
                      get_error_handler(), charm_import_limit,
                      worker_interval, default=sys.argv[1],
                      override=sys.argv[2], target=sys.argv[3],
-                     es_replicas=es_replicas, es_shards=es_shards)
+                     es_replicas=es_replicas, es_shards=es_shards,
+                     charm_testing_url=charm_testing_url,
+                     charm_testing_token=charm_testing_token,
+                     charm_testing_job=charm_testing_job)
 
 
 if __name__ == '__main__':