pdqtest 0.10.0 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +1 -1
  3. data/doc/troubleshooting.md +1 -0
  4. data/doc/upgrading.md +1 -1
  5. data/docker_images/centos/Dockerfile +8 -15
  6. data/docker_images/centos/Makefile +1 -1
  7. data/docker_images/ubuntu/Dockerfile +4 -11
  8. data/docker_images/ubuntu/Makefile +1 -1
  9. data/lib/pdqtest/docker.rb +2 -4
  10. data/lib/pdqtest/version.rb +2 -2
  11. data/pdqtest.gemspec +12 -13
  12. metadata +30 -30
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 1486e70fe329976fc281d23baeb85cd441865254
4
- data.tar.gz: 9208d08425b7b9890fc8d41e519d2ef2777b0dec
2
+ SHA256:
3
+ metadata.gz: b0a8ecf6ad0485b9897c566f8507908e07387c478589e649835bd8699ab706a3
4
+ data.tar.gz: 98812ae521354fe7c85bc759f6479ec5d09e2576c9a0cd1112b8d2651966f35c
5
5
  SHA512:
6
- metadata.gz: d10dfb2cac8a5db32c04fb7376632be1c735cff13b0d2b8d01a40bdf3815e9b4e26734d573d9a6ff26627354325361c72d8964f3df3db6abdcdd731626f4af60
7
- data.tar.gz: 473d65b5bb0ee3f737164908f2ec25703418e80ed44f6aa813dafab5cdf08d76287ef990341fcd557cd49fa6812ffdc903168ab949fe80f236ebc084543fc246
6
+ metadata.gz: 166c821f276a34efdc840ff99178a310be7da0e802cfc96bc363ede0ff0db578d24f51d4c270dddd9a0405878183f8aafe44dc6f8621c260cc82073ff003df37
7
+ data.tar.gz: 0a28c44f779bb3ad7981a8f4317452fa7d7350ccbd5f430a0054755bfeaeaf14ee1da2011fe66c6a96ed523bfa7cd8e7192cf06792e06abfe6cca615d546e6ee
data/README.md CHANGED
@@ -6,7 +6,7 @@ PDQTest - Puppet Docker Quick-test - is the quickest and easiest way to test you
6
6
  * Linting
7
7
  * Syntax
8
8
  * RSpec
9
- * Acceptance ([BATS](https://github.com/sstephenson/bats))
9
+ * Acceptance ([BATS-core](https://github.com/bats-core/bats-core))
10
10
 
11
11
  And can generate code to retrofit testing to a new or existing module, along with skeleton RSpec and acceptance tests to get you started.
12
12
 
data/doc/troubleshooting.md CHANGED
@@ -1,5 +1,6 @@
1
1
  # Troubleshooting
2
2
  * If you can't find the `pdqtest` command and your using `rbenv` be sure to run `rbenv rehash` after installing the gem to create the necessary symlinks
3
+ * If your `pdqtest` command changes version randomly depending which directory your in and you are using `rvm` its probably because `rvm` overrides `cd` and does strange things. You can probably turn this off. Alternatively, use `rbenv`
3
4
  * Don't forget to run `pdqtest setup` before your first `pdqtest` run to download/update the Docker image
4
5
  * If you need to access private git repositories, make sure to use `fixtures.yml` not `.fixtures.yml`
5
6
  * If you need a private key to access private repositories, set this up for your regular git command/ssh and `pdqtest` will reuse the settings
data/doc/upgrading.md CHANGED
@@ -25,4 +25,4 @@ pdqtest setup
25
25
  To obtain the latest version.
26
26
 
27
27
  ## `/cut`
28
- Previous versions of PDQTest mounted code at `/cut` (Code Under Test), this will still work for a few versions but the preferred mountpoint is now the more obvious `/testcase`
28
+ Previous versions of PDQTest mounted code at `/cut` (Code Under Test), the new mountpoint is the more obvious `/testcase`
data/docker_images/centos/Dockerfile CHANGED
@@ -1,13 +1,11 @@
1
- # Install all the RPM packages that puppet will install and disable
2
- # metadata updates so that the environment can be joined to puppet
3
- # and run without error in an offline environment
4
- FROM centos:centos7
1
+ FROM centos:centos7.4.1708
5
2
 
6
3
  # Systemd in docker - state of the art:
7
- # https://developers.redhat.com/blog/2016/09/13/running-systemd-in-a-non-privileged-container/
4
+ # https://hub.docker.com/_/centos/
8
5
  ENV container docker
9
- RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs && \
10
- (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
6
+
7
+ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
8
+ systemd-tmpfiles-setup.service ] || rm -f $i; done); \
11
9
  rm -f /lib/systemd/system/multi-user.target.wants/*;\
12
10
  rm -f /etc/systemd/system/*.wants/*;\
13
11
  rm -f /lib/systemd/system/local-fs.target.wants/*; \
@@ -16,7 +14,7 @@ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
16
14
  rm -f /lib/systemd/system/basic.target.wants/*;\
17
15
  rm -f /lib/systemd/system/anaconda.target.wants/*;
18
16
  VOLUME [ "/sys/fs/cgroup" ]
19
- CMD ["/sbin/init"]
17
+ CMD ["/usr/sbin/init"]
20
18
 
21
19
  RUN yum install -y cronie \
22
20
  initscripts \
@@ -46,12 +44,12 @@ ENV TERM xterm
46
44
  # echo "export TERM=xterm" >> /etc/environment
47
45
 
48
46
  # puppet
49
- RUN yum -y install https://pm.puppetlabs.com/puppet-agent/2017.2.3/1.10.5/repos/el/7/PC1/x86_64/puppet-agent-1.10.5-1.el7.x86_64.rpm && \
47
+ RUN yum -y install https://pm.puppet.com/puppet-agent/2017.3.5/5.3.5/repos/el/7/PC1/x86_64/puppet-agent-5.3.5-1.el7.x86_64.rpm && \
50
48
  /opt/puppetlabs/puppet/bin/puppet --version && \
51
49
  /opt/puppetlabs/puppet/bin/facter --version
52
50
 
53
51
  # bats
54
- RUN git clone https://github.com/sstephenson/bats /usr/local/bats
52
+ RUN git clone https://github.com/bats-core/bats-core /usr/local/bats
55
53
 
56
54
  # librarian
57
55
  RUN /opt/puppetlabs/puppet/bin/gem install librarian-puppet
@@ -63,10 +61,5 @@ RUN /opt/puppetlabs/puppet/bin/gem install git_refresh
63
61
  RUN mkdir /testcase
64
62
  VOLUME /testcase
65
63
 
66
- # code under test (deprecated)
67
- RUN mkdir /cut
68
- VOLUME /cut
69
-
70
-
71
64
  # alternate shudown for systemd
72
65
  STOPSIGNAL SIGRTMIN+3
data/docker_images/centos/Makefile CHANGED
@@ -1,3 +1,3 @@
1
1
  all:
2
2
  # requires experimental mode - see https://github.com/docker/docker/tree/master/experimental#use-docker-experimental
3
- bash -c 'docker build --squash -t geoffwilliams/pdqtest-centos:$$(date -I)-0 .'
3
+ bash -c 'docker build --squash -t declarativesystems/pdqtest-centos:$$(date -I)-0 .'
data/docker_images/ubuntu/Dockerfile CHANGED
@@ -1,10 +1,7 @@
1
- # Install all the RPM packages that puppet will install and disable
2
- # metadata updates so that the environment can be joined to puppet
3
- # and run without error in an offline environment
4
- FROM ubuntu:16.04
1
+ FROM ubuntu:xenial-20180228
5
2
 
6
3
  ENV container docker
7
- ENV LC_ALL C
4
+ ENV LC_ALL C
8
5
  ENV DEBIAN_FRONTEND noninteractive
9
6
 
10
7
  RUN apt-get update && apt-get install systemd && apt-get clean && \
@@ -43,7 +40,7 @@ ENV PATH /usr/local/bats/bin:/opt/puppetlabs/puppet/bin/:/usr/sbin:/sbin:/usr/bi
43
40
  ENV TERM xterm
44
41
 
45
42
  # puppet (and dont run the daemons)
46
- RUN curl -Lo /tmp/puppet-agent.deb https://pm.puppetlabs.com/puppet-agent/2017.2.3/1.10.5/repos/deb/xenial/PC1/puppet-agent_1.10.5-1xenial_amd64.deb && \
43
+ RUN curl -Lo /tmp/puppet-agent.deb https://pm.puppet.com/puppet-agent/2017.3.5/5.3.5/repos/deb/xenial/PC1/puppet-agent_5.3.5-1xenial_amd64.deb && \
47
44
  dpkg -i /tmp/puppet-agent.deb && rm /tmp/puppet-agent.deb && \
48
45
  /opt/puppetlabs/puppet/bin/puppet --version && \
49
46
  /opt/puppetlabs/puppet/bin/facter --version && \
@@ -51,7 +48,7 @@ RUN curl -Lo /tmp/puppet-agent.deb https://pm.puppetlabs.com/puppet-agent/2017.2
51
48
  systemctl disable mcollective
52
49
 
53
50
  # bats
54
- RUN git clone https://github.com/sstephenson/bats /usr/local/bats
51
+ RUN git clone https://github.com/bats-core/bats-core /usr/local/bats
55
52
 
56
53
  # librarian
57
54
  RUN /opt/puppetlabs/puppet/bin/gem install librarian-puppet
@@ -63,9 +60,5 @@ RUN /opt/puppetlabs/puppet/bin/gem install git_refresh
63
60
  RUN mkdir /testcase
64
61
  VOLUME /testcase
65
62
 
66
- # code under test (deprecated)
67
- RUN mkdir /cut
68
- VOLUME /cut
69
-
70
63
  # alternate shudown for systemd
71
64
  STOPSIGNAL SIGRTMIN+3
data/docker_images/ubuntu/Makefile CHANGED
@@ -1,3 +1,3 @@
1
1
  all:
2
2
  # requires experimental mode - see https://github.com/docker/docker/tree/master/experimental#use-docker-experimental
3
- bash -c 'docker build --squash -t geoffwilliams/pdqtest-ubuntu:$$(date -I)-0 .'
3
+ bash -c 'docker build --squash -t declarativesystems/pdqtest-ubuntu:$$(date -I)-0 .'
data/lib/pdqtest/docker.rb CHANGED
@@ -8,8 +8,8 @@ module PDQTest
8
8
  STATUS = 2
9
9
  ENV='export TERM=xterm LC_ALL=C PATH=/usr/local/bats/bin:/opt/puppetlabs/puppet/bin:$PATH;'
10
10
  IMAGES = {
11
- :DEFAULT => 'geoffwilliams/pdqtest-centos:2017-09-19-0',
12
- :UBUNTU => 'geoffwilliams/pdqtest-ubuntu:2017-09-20-0',
11
+ :DEFAULT => 'declarativesystems/pdqtest-centos:2018-04-13-0',
12
+ :UBUNTU => 'declarativesystems/pdqtest-ubuntu:2018-04-13-0',
13
13
  }
14
14
  HIERA_YAML_CONTAINER = '/etc/puppetlabs/puppet/hiera.yaml'
15
15
  HIERA_YAML_HOST = '/spec/fixtures/hiera.yaml'
@@ -90,7 +90,6 @@ module PDQTest
90
90
  test_dir => {pwd => 'rw'},
91
91
  HIERA_YAML_CONTAINER => {hiera_yaml_host => 'rw'},
92
92
  HIERA_DIR => {hiera_dir => 'rw'},
93
- '/cut' => {pwd => 'rw'}, # DEPRECATED -FOR REMOVAL
94
93
  '/sys/fs/cgroup' => {'/sys/fs/cgroup' => 'ro'},
95
94
  YUM_CACHE_CONTAINER => {YUM_CACHE_HOST => 'rw'},
96
95
  },
@@ -98,7 +97,6 @@ module PDQTest
98
97
  "SecurityOpt" => security_opt,
99
98
  "Binds": [
100
99
  "/sys/fs/cgroup:/sys/fs/cgroup:ro",
101
- "#{pwd}:/cut:rw", # DEPRECATED -FOR REMOVAL
102
100
  "#{pwd}:#{test_dir}:rw",
103
101
  "#{hiera_yaml_host}:#{HIERA_YAML_CONTAINER}:rw",
104
102
  "#{hiera_dir}:#{HIERA_DIR}:rw",
data/lib/pdqtest/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module PDQTest
2
- VERSION = "0.10.0"
3
- PUPPET_VERSION = "4.10.8"
2
+ VERSION = "1.0.0"
3
+ PUPPET_VERSION = "5.3.5"
4
4
  end
data/pdqtest.gemspec CHANGED
@@ -10,7 +10,6 @@ Gem::Specification.new do |spec|
10
10
  spec.email = ["geoff.williams@puppetlabs.com"]
11
11
 
12
12
  spec.summary = %q{Quick and simple integration tests run inside of a docker container}
13
- spec.description = %q{write one...}
14
13
  spec.homepage = "https://github.com/GeoffWilliams/pdqtest"
15
14
  spec.licenses = 'Apache-2.0'
16
15
 
@@ -22,22 +21,22 @@ Gem::Specification.new do |spec|
22
21
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
23
22
  spec.require_paths = ["lib"]
24
23
 
25
- spec.add_development_dependency "bundler", "~> 1.15"
24
+ spec.add_development_dependency "bundler", "~> 1.16"
26
25
  spec.add_development_dependency "coveralls", "0.8.21"
27
- spec.add_development_dependency "fakefs", "0.11.0"
28
- spec.add_development_dependency "puppet", "4.10.8"
26
+ spec.add_development_dependency "fakefs", "0.13.3"
27
+ spec.add_development_dependency "puppet", "5.3.5"
29
28
 
30
- spec.add_runtime_dependency "rake", "12.0.0"
31
- spec.add_runtime_dependency "rspec", "3.5.0"
32
- spec.add_runtime_dependency "thor", "0.19.4"
29
+ spec.add_runtime_dependency "rake", "12.3.1"
30
+ spec.add_runtime_dependency "rspec", "3.7.0"
31
+ spec.add_runtime_dependency "thor", "~> 0.19"
33
32
  spec.add_runtime_dependency "minitar", "0.6.1"
34
- spec.add_runtime_dependency "hiera", "3.4.0"
33
+ spec.add_runtime_dependency "hiera", "3.4.2"
35
34
  spec.add_runtime_dependency "escort", "0.4.0"
36
- spec.add_runtime_dependency "docker-api", "1.33.1"
37
- spec.add_runtime_dependency "puppet-lint", "2.1.0"
38
- spec.add_runtime_dependency "puppet-syntax", "2.2.0"
39
- spec.add_runtime_dependency "puppetlabs_spec_helper", "1.2.2"
40
- spec.add_runtime_dependency "librarian-puppet", "2.2.3"
35
+ spec.add_runtime_dependency "docker-api", "1.34.2"
36
+ spec.add_runtime_dependency "puppet-lint", "2.3.5"
37
+ spec.add_runtime_dependency "puppet-syntax", "2.4.1"
38
+ spec.add_runtime_dependency "puppetlabs_spec_helper", "2.6.2"
39
+ spec.add_runtime_dependency "librarian-puppet", "3.0.0"
41
40
  spec.add_runtime_dependency "git_refresh", "0.1.1"
42
41
  spec.add_runtime_dependency "puppet_factset", "0.5.0"
43
42
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pdqtest
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.0
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Geoff Williams
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-10-12 00:00:00.000000000 Z
11
+ date: 2018-04-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.15'
19
+ version: '1.16'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.15'
26
+ version: '1.16'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: coveralls
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -44,70 +44,70 @@ dependencies:
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 0.11.0
47
+ version: 0.13.3
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 0.11.0
54
+ version: 0.13.3
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: puppet
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 4.10.8
61
+ version: 5.3.5
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 4.10.8
68
+ version: 5.3.5
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - '='
74
74
  - !ruby/object:Gem::Version
75
- version: 12.0.0
75
+ version: 12.3.1
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - '='
81
81
  - !ruby/object:Gem::Version
82
- version: 12.0.0
82
+ version: 12.3.1
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - '='
88
88
  - !ruby/object:Gem::Version
89
- version: 3.5.0
89
+ version: 3.7.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - '='
95
95
  - !ruby/object:Gem::Version
96
- version: 3.5.0
96
+ version: 3.7.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: thor
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '='
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 0.19.4
103
+ version: '0.19'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '='
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 0.19.4
110
+ version: '0.19'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: minitar
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - '='
130
130
  - !ruby/object:Gem::Version
131
- version: 3.4.0
131
+ version: 3.4.2
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - '='
137
137
  - !ruby/object:Gem::Version
138
- version: 3.4.0
138
+ version: 3.4.2
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: escort
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -156,70 +156,70 @@ dependencies:
156
156
  requirements:
157
157
  - - '='
158
158
  - !ruby/object:Gem::Version
159
- version: 1.33.1
159
+ version: 1.34.2
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - '='
165
165
  - !ruby/object:Gem::Version
166
- version: 1.33.1
166
+ version: 1.34.2
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: puppet-lint
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
171
  - - '='
172
172
  - !ruby/object:Gem::Version
173
- version: 2.1.0
173
+ version: 2.3.5
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - '='
179
179
  - !ruby/object:Gem::Version
180
- version: 2.1.0
180
+ version: 2.3.5
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: puppet-syntax
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
185
  - - '='
186
186
  - !ruby/object:Gem::Version
187
- version: 2.2.0
187
+ version: 2.4.1
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
192
  - - '='
193
193
  - !ruby/object:Gem::Version
194
- version: 2.2.0
194
+ version: 2.4.1
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: puppetlabs_spec_helper
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
199
  - - '='
200
200
  - !ruby/object:Gem::Version
201
- version: 1.2.2
201
+ version: 2.6.2
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
206
  - - '='
207
207
  - !ruby/object:Gem::Version
208
- version: 1.2.2
208
+ version: 2.6.2
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: librarian-puppet
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
213
  - - '='
214
214
  - !ruby/object:Gem::Version
215
- version: 2.2.3
215
+ version: 3.0.0
216
216
  type: :runtime
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
220
  - - '='
221
221
  - !ruby/object:Gem::Version
222
- version: 2.2.3
222
+ version: 3.0.0
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: git_refresh
225
225
  requirement: !ruby/object:Gem::Requirement
@@ -248,7 +248,7 @@ dependencies:
248
248
  - - '='
249
249
  - !ruby/object:Gem::Version
250
250
  version: 0.5.0
251
- description: write one...
251
+ description:
252
252
  email:
253
253
  - geoff.williams@puppetlabs.com
254
254
  executables:
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
335
335
  version: '0'
336
336
  requirements: []
337
337
  rubyforge_project:
338
- rubygems_version: 2.5.2
338
+ rubygems_version: 2.7.6
339
339
  signing_key:
340
340
  specification_version: 4
341
341
  summary: Quick and simple integration tests run inside of a docker container