Commit ff5d5896494ba6b97a584ec496c848ff02040d1d

Authored by Antonio Terceiro
1 parent 3945a534

ci::jenkins: optimize

Showing 1 changed file with 6 additions and 12 deletions   Show diff stats
cookbooks/ci/recipes/jenkins.rb
... ... @@ -2,23 +2,20 @@ JENKINS_CLI = '/var/cache/jenkins/war/WEB-INF/jenkins-cli.jar'
2 2  
3 3 execute 'jenkins_repo' do
4 4 command 'wget -q -O - http://pkg.jenkins-ci.org/debian-stable/jenkins-ci.org.key | sudo apt-key add -'
  5 + not_if 'apt-key list | grep D50582E6'
5 6 end
6 7  
7 8 execute 'apt_sources' do
8   - command 'echo "deb http://pkg.jenkins-ci.org/debian-stable binary/" >> /etc/apt/sources.list'
  9 + command 'echo "deb http://pkg.jenkins-ci.org/debian-stable binary/" >> /etc/apt/sources.list && apt-get update'
9 10 not_if 'cat /etc/apt/sources.list | grep jenkins-ci'
10 11 end
11 12  
12   -execute 'apt-get update'
13   -
14 13 package 'jenkins'
15 14  
16 15 service 'jenkins' do
17   - action :enable
  16 + action [:enable, :start]
18 17 end
19 18  
20   -execute 'service jenkins restart'
21   -
22 19 package 'nginx'
23 20  
24 21 service 'nginx' do
... ... @@ -40,10 +37,7 @@ end
40 37 link '/etc/nginx/sites-enabled/jenkins' do
41 38 to '/etc/nginx/sites-available/jenkins'
42 39 not_if 'test -L /etc/nginx/sites-enabled/jenkins'
43   -end
44   -
45   -service 'nginx' do
46   - action :restart
  40 + notifies :restart, 'service[nginx]'
47 41 end
48 42  
49 43 package 'git'
... ... @@ -55,7 +49,7 @@ plugins.each do |plugin|
55 49 command "java -jar #{JENKINS_CLI} -s http://localhost/ install-plugin #{plugin}"
56 50 retries 5
57 51 retry_delay 10
  52 + not_if "java -jar #{JENKINS_CLI} -s http://localhost/ list-plugins | grep ^#{plugin}"
  53 + notifies :restart, 'service[jenkins]'
58 54 end
59 55 end
60   -
61   -execute 'service jenkins restart'
62 56 \ No newline at end of file
... ...