Added merlin(federated) horizon.

This commit is contained in:
Egon Rijpkema 2018-08-09 13:19:25 +02:00
parent 8acb4813a1
commit 2e372f3b78

View File

@ -94,6 +94,16 @@ pipeline:
tag: latest tag: latest
when: when:
branch: master branch: master
horizon_merlin:
image: plugins/docker
dockerfile: horizon/Dockerfile
context: horizon
secrets: [docker_username, docker_password]
registry: registry.webhosting.rug.nl
repo: registry.webhosting.rug.nl/hpc/openstack-horizon-merlin
tag: latest
when:
branch: merlin
neutron_controller_merlin: neutron_controller_merlin:
image: plugins/docker image: plugins/docker
dockerfile: neutron_controller/Dockerfile dockerfile: neutron_controller/Dockerfile