Skip to content

Commit

Permalink
Release 2.4.1 (voxpupuli#385)
Browse files Browse the repository at this point in the history
  • Loading branch information
dallinb authored Apr 24, 2017
1 parent 7348327 commit b6e328b
Show file tree
Hide file tree
Showing 30 changed files with 810 additions and 987 deletions.
70 changes: 70 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
---
jobs:
build:
docker:
-
environment:
PUPPET_VERSION: "~> 3.8"
STRICT_VARIABLES: true
image: "ruby:2.1.9"
steps:
- checkout
-
restore_cache:
keys:
- "projectname-{{ .Branch }}-{{ checksum \"Gemfile\" }}"
- "projectname-{{ .Branch }}"
- projectname-master
-
run:
command: "bundle install --without development acceptance --path vendor/bundle"
name: "Bundle Install"
-
run:
command: "bundle clean --force"
name: "Bundle Cleanup"
-
save_cache:
key: "projectname-{{ .Branch }}-{{ checksum \"Gemfile\" }}"
paths:
- vendor/bundle
-
run:
command: "bundle clean --force"
name: "Bundle Cleanup"
-
run:
command: "bundle exec puppet --version"
name: "Show Puppet version"
-
run:
command: "bundle exec travis-lint"
name: "TravisCI Lint"
-
run:
command: "bundle exec rake metadata_lint"
name: "Puppet Metadata Lint"
-
run:
command: "bundle exec rake lint"
name: "Puppet Lint"
-
run:
command: "bundle exec rake validate"
name: "Validate the Puppet code"
-
run:
command: "bundle exec rake spec SPEC_OPTS=\"--format documentation --format RspecJunitFormatter -o $CIRCLE_TEST_REPORTS/rspec/puppet.xml\""
name: "Spec tests"
-
deploy:
name: Deploy from master
command: |
if [ "${CIRCLE_BRANCH}" == "master" -a -z "${RUN_NIGHTLY_BUILD}" ]; then
git config --global user.email "[email protected]"
git config --global user.name "CircleCI"
bundle exec rake strings:gh_pages:update
bundle exec rake deploy
fi
working_directory: ~/cassandra
version: 2
4 changes: 3 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ AllCops:
- 'vendor/**/*'
Metrics/BlockLength:
Enabled: false
Metrics/ClassLength:
Enabled: false
Metrics/LineLength:
Enabled: false
Style/FrozenStringLiteralComment:
Metrics/MethodLength:
Enabled: false
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
env:
- "PUPPET_VERSION='~> 4.5' BEAKER_set=centos6"
- "PUPPET_VERSION='~> 4.5' BEAKER_set=centos6_2"
- "PUPPET_VERSION='~> 4.5' BEAKER_set=centos6_3"
- "PUPPET_VERSION='~> 4.5' BEAKER_set=centos7"
- "PUPPET_VERSION='~> 4.5' BEAKER_set=debian7"
- "PUPPET_VERSION='~> 4.5' BEAKER_set=debian8"
Expand All @@ -22,7 +23,7 @@ script:
- "bundle exec rake lint"
- "bundle exec rake validate"
- "bundle exec rake spec SPEC_OPTS='--format documentation'"
- travis_wait 40 "bundle exec rake acceptance"
- "bundle exec rake acceptance"
notifications:
email: false
matrix:
Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Change Log for Puppet Module locp-cassandra

##2017-04-24 - Release 2.4.1 ([diff](https://github.com/locp/cassandra/compare/2.4.0...2.4.1))

### Summary

A non-functional release of improvements.

### Improvements

* A refactoring and extension of the acceptance tests.
* Migrated from version 1.0 to 2.0 of the CircleCI API.

##2017-03-30 - Release 2.4.0 ([diff](https://github.com/locp/cassandra/compare/2.3.0...2.4.0))

### Summary
Expand Down Expand Up @@ -123,7 +134,7 @@ plugin against the code to improve the code quality.

### Improvements

* The reference documentation is now processed via
* The reference documentation is now processed via
http://locp.github.io/cassandra
* Made a start on refactoring the spec/unit tests so that there is less
duplication of code.
Expand Down Expand Up @@ -988,7 +999,7 @@ override the default behaviour of failing on a non-supported operating system.
service.
* More cleaning up of the README and more links in that file to allow
faster navigation.

##2015-09-01 - Release 1.3.5 ([diff](https://github.com/locp/cassandra/compare/1.3.4...1.3.5))
* Fixed a bug, now allowing the user to set the running state of the
Cassandra service.
Expand Down
42 changes: 0 additions & 42 deletions circle.yml

This file was deleted.

2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "locp-cassandra",
"version": "2.4.0",
"version": "2.4.1",
"author": "locp",
"summary": "Installs Cassandra & DataStax Agent on RHEL/Ubuntu/Debian.",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions rake/rake_tasks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
end

desc 'Run metadata_lint, rubocop, lint, validate and spec.'
task test: %i(
task test: %i[
metadata_lint
rubocop
lint
validate
spec
)
]

desc 'Clean up after a vagrant run.'
task :vagrant_clean do
Expand Down
36 changes: 8 additions & 28 deletions spec/acceptance/bootstrap_spec.rb
Original file line number Diff line number Diff line change
@@ -1,33 +1,13 @@
require 'spec_helper_acceptance'

describe 'Bootstrap' do
bootstrap_pp = <<-EOS
case downcase($::operatingsystem) {
'centos': {
if $::operatingsystemmajrelease == 6 {
exec { '/bin/cp /opt/rh/ruby200/enable /etc/profile.d/ruby.sh': } ->
exec { '/bin/rm /usr/bin/ruby /usr/bin/gem': } ->
exec { '/usr/sbin/alternatives --install /usr/bin/ruby ruby /opt/rh/ruby200/root/usr/bin/ruby 1000': } ->
exec { '/usr/sbin/alternatives --install /usr/bin/gem gem /opt/rh/ruby200/root/usr/bin/gem 1000': }
}
}
'ubuntu': {
if $::operatingsystemmajrelease == 12.04 {
package {'python-software-properties':} ->
exec {'/usr/bin/apt-add-repository ppa:brightbox/ruby-ng':} ->
exec {'/usr/bin/apt-get update': } ->
package {'ruby2.0': } ->
exec { '/bin/rm /usr/bin/ruby': } ->
exec { '/usr/sbin/update-alternatives --install /usr/bin/ruby ruby /usr/bin/ruby2.0 1000': }
}
}
}
EOS
osfamily = fact('osfamily')
roles = hosts[0]['roles']
t = TestManifests.new(roles, 0)
bootstrap_pp = t.bootstrap_pp()

describe '########### Node specific manifest.' do
it 'should work with no errors' do
apply_manifest(bootstrap_pp, catch_failures: true)
shell('[ -d /opt/rh/ruby200 ] && /usr/bin/gem install puppet -v 3.8.7 --no-rdoc --no-ri; true')
end
describe 'Test Entry Criteria' do
it "Should work with no errors (#{osfamily})" do
apply_manifest(bootstrap_pp, catch_failures: true)
shell('[ -d /opt/rh/ruby200 ] && /usr/bin/gem install puppet -v 3.8.7 --no-rdoc --no-ri; true')
end
end
Loading

0 comments on commit b6e328b

Please sign in to comment.