testlab 1.20.6 → 1.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/testlab/container/io.rb +2 -2
- data/lib/testlab/provisioners/nfs_mount.rb +2 -2
- data/lib/testlab/provisioners/templates/apt/provision.erb +6 -6
- data/lib/testlab/provisioners/templates/apt_cacher_ng/provision.erb +1 -1
- data/lib/testlab/provisioners/templates/chef/omni_bus.erb +1 -1
- data/lib/testlab/provisioners/templates/chef/omni_truck.erb +2 -2
- data/lib/testlab/provisioners/templates/chef/ruby_gem_client.erb +2 -2
- data/lib/testlab/provisioners/templates/chef/ruby_gem_server.erb +2 -2
- data/lib/testlab/provisioners/templates/raring/provision.erb +2 -2
- data/lib/testlab/version.rb +1 -1
- data/spec/support/Labfile +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NWM4N2M1NzJkMjg1NDkzYzgxYmQ0YTU0YmQ4ODQ2NWE4NmU1MjVlZA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MjJiYTNkNDM3ZDUyYmFiNGFhNTdmMDRiNWNhNDUxZjk2ODViY2Q4Ng==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
ZTkyMzIyMjM5Njk0NTFlYzlmOWRiZmY0ODA4NGQ2ODUxYTRjYzEwYmRhZmRh
|
10
|
+
Njc3NjE0OGRmOWI4ZjI3N2M1Mzc4ZTBjOTc1YzIxMWQ3ZTBiYTE0MGJkOTg4
|
11
|
+
ZDhhYjk1MjlmZjYwODRlZmZjOWNjMTQwZWQ1OWNjOTNlMjZmNjE=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MjVlNDVhNzUyYmNmOTBlNDcwY2E2MDUwNWMwODRhZWQ4MTJmZTE0NWVkNDMw
|
14
|
+
NDA5ZjljY2RmNGVjMjIyOGQ3NWEyODAwMzE1MmJiZDZhMGJiNDZhYWFjNmM1
|
15
|
+
YjY5MjdkYjFkNmRmZjRiODY1YjAwNGJlMWU0ZjE3ZTY1NjhmM2M=
|
data/lib/testlab/container/io.rb
CHANGED
@@ -74,8 +74,8 @@ class TestLab
|
|
74
74
|
# Ensure the container is stopped before we attempt to export it.
|
75
75
|
self.down
|
76
76
|
|
77
|
-
self.lxc.execute(%(/bin/bash -c 'apt-get -
|
78
|
-
self.lxc.execute(%(/bin/bash -c 'apt-get -
|
77
|
+
self.lxc.execute(%(/bin/bash -c 'apt-get -qy autoremove'))
|
78
|
+
self.lxc.execute(%(/bin/bash -c 'apt-get -qy clean'))
|
79
79
|
|
80
80
|
export_tempfile = Tempfile.new('export')
|
81
81
|
remote_filename = File.basename(export_tempfile.path.dup)
|
@@ -26,7 +26,7 @@ class TestLab
|
|
26
26
|
|
27
27
|
# NFSMount: Container Provision
|
28
28
|
def on_container_provision(container)
|
29
|
-
container.exec(%(sudo dpkg --status nfs-common || sudo apt-get -
|
29
|
+
container.exec(%(sudo dpkg --status nfs-common || sudo apt-get -qy install nfs-common))
|
30
30
|
|
31
31
|
add_nfs_mounts(container)
|
32
32
|
container_mount(container)
|
@@ -122,7 +122,7 @@ EOI
|
|
122
122
|
when /darwin/ then
|
123
123
|
%(#{sudo} nfsd enable)
|
124
124
|
when /linux/ then
|
125
|
-
%((#{sudo} dpkg --status nfs-kernel-server || #{sudo} apt-get -
|
125
|
+
%((#{sudo} dpkg --status nfs-kernel-server || #{sudo} apt-get -qy install nfs-kernel-server) && #{sudo} service nfs-kernel-server start)
|
126
126
|
end
|
127
127
|
end
|
128
128
|
|
@@ -4,31 +4,31 @@ export DEBIAN_FRONTEND="noninteractive"
|
|
4
4
|
rm -fv /etc/dpkg/dpkg.cfg.d/multiarch || true
|
5
5
|
<% end -%>
|
6
6
|
|
7
|
-
apt-get -
|
8
|
-
apt-get -
|
7
|
+
apt-get -qy update
|
8
|
+
apt-get -qy install apt-transport-https
|
9
9
|
|
10
10
|
<% if !@apt[:sources].nil? && @apt[:sources].count > 0 -%>
|
11
11
|
rm -fv /etc/apt/sources.list || true
|
12
12
|
<% @apt[:sources].flatten.compact.each do |source| -%>
|
13
13
|
echo '<%= source %>' | tee -a /etc/apt/sources.list
|
14
14
|
<% end -%>
|
15
|
-
apt-get -
|
15
|
+
apt-get -qy update
|
16
16
|
<% end -%>
|
17
17
|
|
18
18
|
<% if !@apt[:install].nil? -%>
|
19
19
|
<% @apt[:install].flatten.compact.each do |package| -%>
|
20
|
-
dpkg --status <%= package %> &> /dev/null || apt-get -
|
20
|
+
dpkg --status <%= package %> &> /dev/null || apt-get -qy install <%= package %>
|
21
21
|
<% end -%>
|
22
22
|
<% end -%>
|
23
23
|
|
24
24
|
<% if !@apt[:remove].nil? -%>
|
25
25
|
<% @apt[:remove].flatten.compact.each do |package| -%>
|
26
|
-
dpkg --status <%= package %> &> /dev/null && apt-get -
|
26
|
+
dpkg --status <%= package %> &> /dev/null && apt-get -qy remove <%= package %>
|
27
27
|
<% end -%>
|
28
28
|
<% end -%>
|
29
29
|
|
30
30
|
<% if !@apt[:purge].nil? -%>
|
31
31
|
<% @apt[:purge].flatten.compact.each do |package| -%>
|
32
|
-
dpkg --status <%= package %> &> /dev/null && apt-get -
|
32
|
+
dpkg --status <%= package %> &> /dev/null && apt-get -qy purge <%= package %>
|
33
33
|
<% end -%>
|
34
34
|
<% end -%>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
export DEBIAN_FRONTEND="noninteractive"
|
2
2
|
|
3
3
|
if ! dpkg --status apt-cacher-ng &> /dev/null; then
|
4
|
-
apt-get -
|
4
|
+
apt-get -qy install apt-cacher-ng
|
5
5
|
service apt-cacher-ng restart || service apt-cacher-ng start
|
6
6
|
grep "^MIRROR" /etc/default/lxc || (echo 'MIRROR="http://127.0.0.1:3142/archive.ubuntu.com/ubuntu"' | tee -a /etc/default/lxc)
|
7
7
|
fi
|
@@ -12,7 +12,7 @@ export HOME="<%= @home_dir %>"
|
|
12
12
|
export
|
13
13
|
|
14
14
|
cd /tmp
|
15
|
-
apt-get -
|
15
|
+
apt-get -qy install wget ca-certificates || yum -y install wget ca-certificates
|
16
16
|
rm -fv /tmp/install.sh
|
17
17
|
wget -v https://www.opscode.com/chef/install.sh -O /tmp/install.sh
|
18
18
|
/bin/bash /tmp/install.sh -v <%= @chef[:client][:version] %>
|
@@ -15,8 +15,8 @@ export
|
|
15
15
|
mkdir -p ${CHEF_SOLO_ROOT}
|
16
16
|
cd ${CHEF_SOLO_ROOT}
|
17
17
|
|
18
|
-
apt-get -
|
19
|
-
apt-get -
|
18
|
+
apt-get -qy update
|
19
|
+
apt-get -qy install build-essential expect wget curl libgecode-dev ca-certificates
|
20
20
|
|
21
21
|
mkdir -pv /etc/chef /var/log/chef ${HOME}/.chef
|
22
22
|
|
@@ -14,8 +14,8 @@ export
|
|
14
14
|
mkdir -pv ${CHEF_SOLO_ROOT}
|
15
15
|
cd ${CHEF_SOLO_ROOT}
|
16
16
|
|
17
|
-
apt-get -
|
18
|
-
apt-get -
|
17
|
+
apt-get -qy update
|
18
|
+
apt-get -qy install build-essential expect wget curl libgecode-dev ca-certificates ruby1.8 rubygems
|
19
19
|
|
20
20
|
mkdir -pv /etc/chef /var/log/chef ${HOME}/.chef
|
21
21
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
export DEBIAN_FRONTEND="noninteractive"
|
2
2
|
|
3
3
|
# Update APT and ensure our required packages are installed
|
4
|
-
apt-get -
|
4
|
+
apt-get -qy update
|
5
5
|
<% %w(lxc apparmor bridge-utils debootstrap yum iptables iptables-persistent ntpdate ntp pbzip2).each do |package| -%>
|
6
|
-
dpkg --status <%= package %> &> /dev/null || apt-get -
|
6
|
+
dpkg --status <%= package %> &> /dev/null || apt-get -qy install <%= package %>
|
7
7
|
<% end -%>
|
8
8
|
|
9
9
|
# Ensure the default lxc networking services are off
|
data/lib/testlab/version.rb
CHANGED
data/spec/support/Labfile
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: testlab
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.21.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Zachary Patten
|
@@ -389,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
389
389
|
version: '0'
|
390
390
|
requirements: []
|
391
391
|
rubyforge_project:
|
392
|
-
rubygems_version: 2.
|
392
|
+
rubygems_version: 2.1.11
|
393
393
|
signing_key:
|
394
394
|
specification_version: 4
|
395
395
|
summary: A toolkit for building virtual computer labs
|