Merge lp:~doanac/charms/precise/ubuntu-ci-services-itself/lander-image-builder-start into lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander

[Andy Doan]

This adds relations for the image builder and provides some scaffolding so it actually builds something.

[Paul Larson (pwlars)]

I'm not too familiar with what lander_merge_parameters does, but if this is just supposed to be some sane values that should work as a quick test, that seems fine to me. Does it need to wait and see the end status for it? Does it need to do cleanup or anything? Every time you run this, you'll get a new copy of the image out in glance. I ask, because at least my personal account seems to have some limitations on the space, I got an error today that it was out of space.

[Andy Doan (doanac)]

On 01/27/2014 09:04 AM, Paul Larson wrote:
> I'm not too familiar with what lander_merge_parameters does, but if
> this is just supposed to be some sane values that should work as a
> quick test, that seems fine to me.

that was my idea. once the bsbuilder starts creating something real,
we'll be able to back out the hard-coded portion.

> Does it need to wait and see the
> end status for it?

yeah - we have to make the jenkins job listen to the progress-trigger so
it will know what to pass downstream to the next job.

> Does it need to do cleanup or anything? Every time
> you run this, you'll get a new copy of the image out in glance. I
> ask, because at least my personal account seems to have some
> limitations on the space, I got an error today that it was out of
> space.

i'm guessing we'll need to clean up these objects every so often during
development

[lp:~doanac/charms/precise/ubuntu-ci-services-itself/lander-image-builder-start]

30. By Andy Doan on 2014-01-27

add ticket-system information into params

[Francis Ginther (fginther)]

approve

review: Approve

=== modified file 'templates/jobs/lander_master.xml'
--- templates/jobs/lander_master.xml	2014-01-15 18:27:36 +0000
+++ templates/jobs/lander_master.xml	2014-01-27 21:53:47 +0000
@@ -33,6 +33,8 @@
 
 ppa_ip=$(grep ppa-django /srv/lander_jenkins/juju-relations/* | awk '{print $NF}' | head -n1)
 bsb_ip=$(grep bsb-restish /srv/lander_jenkins/juju-relations/* | awk '{print $NF}' | head -n1)
+img_ip=$(grep imagebuild-restish /srv/lander_jenkins/juju-relations/* | awk '{print $NF}' | head -n1)
+ts_ip=$(grep ts-django /srv/lander_jenkins/juju-relations/* | awk '{print $NF}' | head -n1)
 
 # Convert to input file
 request_parameters=$(echo $request_parameters | sed -e 's/^"//' -e 's/"$//')
@@ -42,6 +44,16 @@
   "progress_trigger": "${JOB_NAME}-${BUILD_NUMBER}",
   "ppa_assigner_url": "http://${ppa_ip}:8080",
   "bsb_url": "http://${bsb_ip}:8080",
+  "imgbuilder_url": "http://${img_ip}:8080",
+  "ts_url": "http://${ts_ip}:8080",
+  "package_list": ["phablet-tools"],
+  "base_image": {
+    "image_type": "cloud",
+    "url_list": [
+      "http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img"
+    ],
+    "series": "trusty"
+  },
   "request_parameters": $request_parameters
 }
 EOF
@@ -153,6 +165,13 @@
 child_number=$TRIGGERED_BUILD_NUMBER_lander_branch_source_builder
 wget -O params.json "${JENKINS_URL}job/${LAST_TRIGGERED_JOB_NAME}/${child_number}/artifact/results/params.json"
 
+# TODO - temporary until the bsbuilder works properly
+cat > params.json <<EOF
+{
+  "ppa": "ppa:phablet-team/tools"
+}
+EOF
+
 /srv/lander_jenkins/lander/bin/lander_merge_parameters.py --result-file params.json --service bsbuilder --output-file all.json --prior-file all.json
 
 # Convert to a format that can be passed to the child jobs