Add cf-cli job to errand vms

cf-platform-eng · May 16, 2019 · b646444 · b646444
1 parent 5d2ade2
commit b646444
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/tile_generator/templates/jobs/delete-all.sh.erb b/tile_generator/templates/jobs/delete-all.sh.erb
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export PATH="/var/vcap/packages/cf-cli-6-linux/bin:$PATH"
 export CF=`which cf`
 
 function cf() {

diff --git a/tile_generator/templates/jobs/deploy-all.sh.erb b/tile_generator/templates/jobs/deploy-all.sh.erb
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export PATH="/var/vcap/packages/cf-cli-6-linux/bin:$PATH"
 export CF=`which cf`
 
 function cf() {

diff --git a/tile_generator/test_metadata_expected_output.yml b/tile_generator/test_metadata_expected_output.yml
@@ -1652,6 +1652,8 @@ job_types:
         from: redis
     name: deploy-all
     release: test-tile
+  - name: cf-cli-6-linux
+    release: cf-cli
 - dynamic_ip: 1
   errand: true
   instance_definition:
@@ -1819,6 +1821,8 @@ job_types:
         from: redis
     name: delete-all
     release: test-tile
+  - name: cf-cli-6-linux
+    release: cf-cli
 
 
 runtime_configs:

diff --git a/tile_generator/tile_metadata.py b/tile_generator/tile_metadata.py
@@ -665,6 +665,11 @@ def _build_job_types(self):
                         ], 
                         "manifest": literal_unicode(template_helper.render_yaml(job.get('manifest')))
                     }
+                    if job['name'] == 'deploy-all' or job['name'] == 'delete-all':
+                        job_type['templates'].append({
+                            "release": 'cf-cli',
+                            "name": 'cf-cli-6-linux',
+                        })
                     if job.get('run_post_deploy_errand_default'):
                         job_type['run_post_deploy_errand_default'] = job.get('run_post_deploy_errand_default')
                     if job.get('run_pre_delete_errand_default'):