Skip to content

Commit c82bdee

Browse files
committed
Merge branch 'ubuntu-jammy' into merge-jammy
2 parents aac6489 + 229001f commit c82bdee

120 files changed

Lines changed: 3027 additions & 3257 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bundle/config

Lines changed: 0 additions & 2 deletions
This file was deleted.

.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ jobs:
1111
- name: test-bosh-stemcell
1212
run: |
1313
bundle install
14-
bundle exec rspec
14+
bundle exec rake
1515
working-directory: bosh-stemcell/

.rubocop.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

Gemfile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
source 'https://rubygems.org'
22

3-
group :development, :test do
4-
gem 'bosh-stemcell', path: 'bosh-stemcell'
5-
gem 'fakefs'
6-
gem 'logging'
7-
gem 'rake'
8-
gem 'rspec'
9-
gem 'rspec-instafail'
10-
gem 'rspec-its'
11-
gem 'timecop'
12-
end
3+
gem 'rake'
4+
gem 'bosh-stemcell', path: 'bosh-stemcell'

Gemfile.lock

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,14 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
diff-lcs (1.6.2)
10-
fakefs (3.2.1)
11-
little-plugger (1.1.4)
12-
logging (2.4.0)
13-
little-plugger (~> 1.1)
14-
multi_json (~> 1.14)
15-
multi_json (1.20.0)
169
rake (13.3.1)
17-
rspec (3.13.2)
18-
rspec-core (~> 3.13.0)
19-
rspec-expectations (~> 3.13.0)
20-
rspec-mocks (~> 3.13.0)
21-
rspec-core (3.13.6)
22-
rspec-support (~> 3.13.0)
23-
rspec-expectations (3.13.5)
24-
diff-lcs (>= 1.2.0, < 2.0)
25-
rspec-support (~> 3.13.0)
26-
rspec-instafail (1.0.0)
27-
rspec
28-
rspec-its (2.0.0)
29-
rspec-core (>= 3.13.0)
30-
rspec-expectations (>= 3.13.0)
31-
rspec-mocks (3.13.8)
32-
diff-lcs (>= 1.2.0, < 2.0)
33-
rspec-support (~> 3.13.0)
34-
rspec-support (3.13.7)
35-
timecop (0.9.10)
3610

3711
PLATFORMS
3812
ruby
3913

4014
DEPENDENCIES
4115
bosh-stemcell!
42-
fakefs
43-
logging
4416
rake
45-
rspec
46-
rspec-instafail
47-
rspec-its
48-
timecop
4917

5018
BUNDLED WITH
5119
2.5.23

README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,23 +175,17 @@ locally, run:
175175
```shell
176176
bundle install --local
177177
cd /opt/bosh/bosh-stemcell
178-
OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rspec spec/ --tag shellout_types
179-
```
180-
181-
If on macOS, run:
182-
183-
```shell
184-
OSX=true OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rspec spec/ --tag shellout_types
178+
OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rake spec:shellout_types
185179
```
186180

187181
### How to run tests for BOSH Linux Stemcell Builder
188182

189183
The BOSH Linux Stemcell Builder code itself can be tested with the following command's:
190184

191185
```shell
192-
bundle install --local
193186
cd /opt/bosh/bosh-stemcell
194-
bundle exec rspec spec/
187+
bundle install
188+
bundle exec rake
195189
```
196190

197191
## Troubleshooting

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require 'json'
2-
require 'logging'
32

43
namespace :stemcell do
54
desc 'Build a base OS image for use in stemcells'

bosh-stemcell/.rubocop.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

bosh-stemcell/Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "https://rubygems.org"
2+
3+
gemspec

0 commit comments

Comments
 (0)