Download as
Browse Code »

Commit 80ac628c606fa0c296e740fb5d47e57cd301e23b

Authored by Antonio Terceiro
1 parent f4891287
Exists in master and in 65 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

some test infrastructure

Showing 2 changed files with 15 additions and 1 deletions   Show diff stats
utils/centos6-vagrant-lxc/Makefile
  Diff comments   View file @80ac628
@@ -2,6 +2,8 @@ BOX = centos6 @@ -2,6 +2,8 @@ BOX = centos6
2 TEMPLATE_ARGS = -t centos -- --release 6.5 2 TEMPLATE_ARGS = -t centos -- --release 6.5
3 LXC_PATH := $(shell sudo lxc-config lxc.lxcpath) 3 LXC_PATH := $(shell sudo lxc-config lxc.lxcpath)
4 4
  5 +all: $(BOX).box
  6 +
5 $(BOX).box: metadata.json lxc.conf lxc-template rootfs.tar.gz 7 $(BOX).box: metadata.json lxc.conf lxc-template rootfs.tar.gz
6 $(RM) $@ 8 $(RM) $@
7 tar czf $@ $^ 9 tar czf $@ $^
@@ -30,7 +32,7 @@ metadata.json: metadata.json.in @@ -30,7 +32,7 @@ metadata.json: metadata.json.in
30 ./metadata.json.in > $@ 32 ./metadata.json.in > $@
31 33
32 uninstall: 34 uninstall:
33 - vagrant box remove $(BOX) 35 + vagrant box remove $(BOX) || true
34 36
35 install: $(BOX).box 37 install: $(BOX).box
36 vagrant box add $(BOX) $^ 38 vagrant box add $(BOX) $^
@@ -45,3 +47,6 @@ fullclean: clean @@ -45,3 +47,6 @@ fullclean: clean
45 $(RM) lxc.conf 47 $(RM) lxc.conf
46 $(RM) metadata.json 48 $(RM) metadata.json
47 sudo lxc-destroy -n $(BOX)-base 49 sudo lxc-destroy -n $(BOX)-base
  50 +
  51 +retry: clean uninstall all install
  52 + vagrant up
utils/centos6-vagrant-lxc/Vagrantfile 0 → 100644
  Diff comments   View file @80ac628
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +# -*- mode: ruby -*-
  2 +# vi: set ft=ruby :
  3 +
  4 +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
  5 +VAGRANTFILE_API_VERSION = "2"
  6 +
  7 +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  8 + config.vm.box = "centos6"
  9 +end