Download as
Browse Code »

Commit ff5d5896494ba6b97a584ec496c848ff02040d1d

Authored by Antonio Terceiro
1 parent 3945a534
Exists in master and in 89 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

ci::jenkins: optimize

Showing 1 changed file with 6 additions and 12 deletions   Show diff stats
cookbooks/ci/recipes/jenkins.rb
  Diff comments   View file @ff5d589
... ... @@ -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
... ...