Merge lp:~ricardokirkner/ols-jenkaas/k8s-rollout-using-generic-makefile into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 544
Merged at revision: 544
Proposed branch: lp:~ricardokirkner/ols-jenkaas/k8s-rollout-using-generic-makefile
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
jobs/isitdeployable.yaml (+1/-1)
To merge this branch: bzr merge lp:~ricardokirkner/ols-jenkaas/k8s-rollout-using-generic-makefile
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+333836@code.launchpad.net

Commit message

deploy using generic Makefile from ols-k8s branch

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/isitdeployable.yaml'
2--- jobs/isitdeployable.yaml 2017-11-13 14:05:17 +0000
3+++ jobs/isitdeployable.yaml 2017-11-16 17:53:51 +0000
4@@ -6,7 +6,7 @@
5 docker-build: "make k8s-build IMAGE_TAG=${{IMAGE_TAG}}"
6 docker-test: "make k8s-build docker-test IMAGE_TAG=${{IMAGE_TAG}}"
7 docker-push: "make k8s-upload DOCKER_REGISTRY={docker-registry} IMAGE_TAG=${{IMAGE_TAG}}"
8- rollout-setup-command: "git clone lp:ols-k8s && rsync -avz ols-k8s/isitdeployable/production/ deployment/ && \\$(eval cat deployment/envrc)"
9+ rollout-setup-command: "git clone lp:ols-k8s deployment/ols-k8s && rsync -avz deployment/ols-k8s/isitdeployable/production/ deployment/ && \\$(eval cat deployment/envrc)"
10 rollout-command: "make -C deployment release IMAGE_TAG=${{IMAGE_TAG}}"
11 jobs:
12 - 'land-{name}-dependencies'

Subscribers

People subscribed via source and target branches