openstack
/
puppet-ceph
Code Issues Proposed changes

Drop no longer supported releases 

According to http://ceph.com/docs/master/releases/ only firefly and hammer
are supported versions by ceph.com.
Therefore this proposes to drop the no longer supported versions from the
tests.

Change-Id: Ibe738e7f17e4632e5d1deeabc4e6f937f1b1366a
This commit is contained in:
David Gurtner 2015-08-18 11:58:31 +02:00
parent 398b904eb5
commit aa6a46bbde
12 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -122,7 +122,7 @@ The RELEASES environment variable contains the list of ceph releases
for which integration tests are going to be run. The default is
```
RELEASES='dumpling firefly giant hammer' \
RELEASES='firefly hammer' \
bundle exec rake spec:system
```

4
spec/system/ceph_key_spec.rb
View File

@ -24,7 +24,7 @@ require 'spec_helper_system'
describe 'ceph::key' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
mon_key = 'AQCztJdSyNb0NBAASA2yPZPuwXeIQnDJ9O8gVw=='
@ -234,7 +234,7 @@ end
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# MACHINES=first \
# RELEASES=dumpling \
# RELEASES=hammer \
# RS_DESTROY=no \
# RS_SET=ubuntu-server-1204-x64 \
# BUNDLE_PATH=/tmp/vendor \

4
spec/system/ceph_mon_spec.rb
View File

@ -21,7 +21,7 @@ require 'spec_helper_system'
describe 'ceph::mon' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
mon_host = '$::ipaddress'
@ -320,7 +320,7 @@ end
# )
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# RELEASES=dumpling \
# RELEASES=hammer \
# RS_DESTROY=no \
# RS_SET=two-ubuntu-server-1204-x64 \
# BUNDLE_PATH=/tmp/vendor \

4
spec/system/ceph_mons_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper_system'
describe 'ceph::mons' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
@ -486,7 +486,7 @@ end
# )
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# RELEASES=dumpling \
# RELEASES=hammer \
# MACHINES=first \
# RS_DESTROY=no \
# RS_SET=ubuntu-server-1204-x64 \

4
spec/system/ceph_osd_spec.rb
View File

@ -22,7 +22,7 @@ require 'spec_helper_system'
describe 'ceph::osd' do
datas = ENV['DATAS'] ? ENV['DATAS'].split : [ '/dev/sdb', '/srv/data' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
admin_key = 'AQA0TVRTsP/aHxAAFBvntu1dSEJHxtJeFFrRsg=='
@ -424,7 +424,7 @@ end
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# MACHINES=first \
# RELEASES=dumpling \
# RELEASES=hammer \
# DATAS=/srv/data \
# RS_DESTROY=no \
# RS_SET=ubuntu-server-1204-x64 \

4
spec/system/ceph_osds_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper_system'
describe 'ceph::osds' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
@ -222,7 +222,7 @@ end
# )
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# RELEASES=dumpling \
# RELEASES=hammer \
# MACHINES=first \
# RS_DESTROY=no \
# RS_SET=ubuntu-server-1204-x64 \

4
spec/system/ceph_pool_spec.rb
View File

@ -21,7 +21,7 @@ require 'spec_helper_system'
describe 'ceph::pool' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
mon_host = '$::ipaddress'
# passing it directly as unqoted array is not supported everywhere
@ -151,7 +151,7 @@ end
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# MACHINES=first \
# RELEASES=dumpling \
# RELEASES=hammer \
# RS_DESTROY=no \
# RS_SET=ubuntu-server-1204-x64 \
# BUNDLE_PATH=/tmp/vendor \

4
spec/system/ceph_profile_base_spec.rb
View File

@ -20,9 +20,7 @@ require 'spec_helper_system'
describe 'ceph::profile::base' do
release2version = {
'dumpling' => '0.67',
'firefly' => '0.80',
'giant' => '0.87',
'hammer' => '0.94',
}
@ -124,7 +122,7 @@ end
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# MACHINES=first \
# RELEASES=dumpling \
# RELEASES=hammer \
# RS_DESTROY=no \
# RS_SET=ubuntu-server-1204-x64 \
# BUNDLE_PATH=/tmp/vendor \

4
spec/system/ceph_profile_client_spec.rb
View File

@ -20,7 +20,7 @@ require 'spec_helper_system'
describe 'ceph::profile::client' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
packages = "[ 'python-ceph', 'ceph-common', 'librados2', 'librbd1', 'libcephfs1' ]"
@ -250,7 +250,7 @@ end
# )
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# RELEASES=dumpling \
# RELEASES=hammer \
# RS_SET=two-ubuntu-server-1204-x64 \
# RS_DESTROY=no \
# BUNDLE_PATH=/tmp/vendor \

4
spec/system/ceph_profile_mon_spec.rb
View File

@ -20,7 +20,7 @@ require 'spec_helper_system'
describe 'ceph::profile::mon' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
packages = "[ 'python-ceph', 'ceph-common', 'librados2', 'librbd1', 'libcephfs1' ]"
@ -366,7 +366,7 @@ end
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# MACHINES='first second' \
# RELEASES=dumpling \
# RELEASES=hammer \
# RS_DESTROY=no \
# RS_SET=two-ubuntu-server-1204-x64 \
# BUNDLE_PATH=/tmp/vendor \

4
spec/system/ceph_profile_osd_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper_system'
describe 'ceph::profile::osd' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant', 'hammer' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'firefly', 'hammer' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
packages = "[ 'python-ceph', 'ceph-common', 'librados2', 'librbd1', 'libcephfs1' ]"
@ -451,7 +451,7 @@ end
# )
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# RELEASES=dumpling \
# RELEASES=hammer \
# RS_SET=two-ubuntu-server-1204-x64 \
# RS_DESTROY=no \
# BUNDLE_PATH=/tmp/vendor \

4
spec/system/ceph_repo_spec.rb
View File

@ -22,9 +22,7 @@ require 'spec_helper_system'
describe 'ceph::repo' do
release2version = {
'dumpling' => '0.67',
'firefly' => '0.80',
'giant' => '0.87',
'hammer' => '0.94',
'(default)' => '0.94',
}
@ -311,7 +309,7 @@ end
# cp -a Gemfile-rspec-system Gemfile
# BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
# MACHINES=first \
# RELEASES=dumpling \
# RELEASES=hammer \
# RS_DESTROY=no \
# RS_SET=ubuntu-server-1204-x64 \
# BUNDLE_PATH=/tmp/vendor \