added merlin builds

.drone.yml

@@ -1,4 +1,8 @@
 ---
+# When the issue below is resolved, we can build the
+# image that was actually changed.
+# https://github.com/drone/drone/issues/1021
+
 pipeline:
   cinder_controller:
     image: plugins/docker
@@ -8,6 +12,8 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-cinder-controller
     tag: latest
+    when:
+      branch: master
   cinder_storage:
     image: plugins/docker
     dockerfile: cinder_storage/Dockerfile
@@ -16,6 +22,8 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-cinder-storage
     tag: latest
+    when:
+      branch: master
   glance:
     image: plugins/docker
     dockerfile: glance/Dockerfile
@@ -24,6 +32,8 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-glance
     tag: latest
+    when:
+      branch: master
   heat:
     image: plugins/docker
     dockerfile: heat/Dockerfile
@@ -32,6 +42,8 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-heat
     tag: latest
+    when:
+      branch: master
   horizon:
     image: plugins/docker
     dockerfile: horizon/Dockerfile
@@ -40,6 +52,8 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-horizon
     tag: latest
+    when:
+      branch: master
   keystone:
     image: plugins/docker
     dockerfile: keystone/Dockerfile
@@ -48,6 +62,8 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-keystone
     tag: latest
+    when:
+      branch: master
   neutron_controller:
     image: plugins/docker
     dockerfile: neutron_controller/Dockerfile
@@ -56,6 +72,8 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-neutron-controller
     tag: latest
+    when:
+      branch: master
   nova_service:
     image: plugins/docker
     dockerfile: nova_service/Dockerfile
@@ -64,6 +82,8 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-nova-service
     tag: latest
+    when:
+      branch: master
   nova_compute:
     image: plugins/docker
     dockerfile: nova_compute/Dockerfile
@@ -72,13 +92,55 @@ pipeline:
     registry: registry.webhosting.rug.nl
     repo: registry.webhosting.rug.nl/hpc/openstack-nova-compute
     tag: latest
+    when:
+      branch: master
+  neutron_controller_merlin:
+    image: plugins/docker
+    dockerfile: neutron_controller/Dockerfile
+    context: neutron_controller
+    secrets: [docker_username, docker_password]
+    registry: registry.webhosting.rug.nl
+    repo: registry.webhosting.rug.nl/hpc/openstack-neutron-controller-merlin
+    tag: latest
+    when:
+      branch: merlin
+  cinder_storage_merlin:
+    image: plugins/docker
+    dockerfile: cinder_storage/Dockerfile
+    context: cinder_storage
+    secrets: [docker_username, docker_password]
+    registry: registry.webhosting.rug.nl
+    repo: registry.webhosting.rug.nl/hpc/openstack-cinder-storage-merlin
+    tag: latest
+    when:
+      branch: merlin
+  nova_compute_merlin:
+    image: plugins/docker
+    dockerfile: nova_compute/Dockerfile
+    context: nova_compute
+    secrets: [docker_username, docker_password]
+    registry: registry.webhosting.rug.nl
+    repo: registry.webhosting.rug.nl/hpc/openstack-nova-compute-merlin
+    tag: latest
+    when:
+      branch: merlin
+  glance_merlin:
+    image: plugins/docker
+    dockerfile: glance/Dockerfile
+    context: glance
+    secrets: [docker_username, docker_password]
+    registry: registry.webhosting.rug.nl
+    repo: registry.webhosting.rug.nl/hpc/openstack-glance-merlin
+    tag: latest
+    when:
+      branch: merlin
   notify:
     image: drillster/drone-email
     host: smtp.rug.nl
     port: 25
     skip_verify: true
     from: drone@webhosting.rug.nl
-    #recipients: [e.m.a.rijpkema@rug.nl, w.k.nap@rug.nl]
+    # recipients: [e.m.a.rijpkema@rug.nl, w.k.nap@rug.nl]
     recipients: [e.m.a.rijpkema@rug.nl]
     recipients_only: true
     when: