ci::jenkins: optimize

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