x/ci-cd-pipeline-app-murano
Code Issues Proposed changes

[Jenkins] Add usage of applyManifest method to Jenkins.yaml

Browse Source 
Small refactoring: added usage of applyManifest method instead of
coping puppet to some folder on the instance and executing it from
this directory.

Change-Id: I910dd11f68fedce11eb322cb39a47844a895387c
This commit is contained in:
Anastasia Kuznetsova 2016-07-07 18:45:53 +03:00 committed by Alexey Khivin
parent e6a356892a
commit e58b57b8e2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
murano-apps/Jenkins/package/Classes/Jenkins.yaml
View File

@ -247,9 +247,8 @@ Methods:
- $._environment.reporter.report($this, 'Installing and configuring Jenkins Job Builder...')
- $script: $resources.string('scripts/update_jobs.sh')
- $linux.putFile($.instance.agent, $script, '/usr/local/bin/update_jobs.sh')
- $script: $resources.string('scripts/install_jjb.pp')
- $linux.putFile($.instance.agent, $script, '/usr/local/bin/install_jjb.pp')
- $linux.runCommand($.instance.agent, 'puppet apply /usr/local/bin/install_jjb.pp')
- $manifest: $resources.string('scripts/install_jjb.pp')
- $this.instance.applyManifest($manifest, 180)
- If: $.gerrit != null
Then:
- $._environment.reporter.report($this, 'Switching to project-config from installed Gerrit...')