Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c8b4e1d
More tests on for nodes
alvagante Sep 2, 2017
933eb43
PDK generated rabbitmw and redis tp profiles
alvagante Sep 2, 2017
1efe33d
Added Profile::Password custom data type
alvagante Sep 2, 2017
9d4c2a4
About sensu, monitor, profile design and tp profiles. With links.
alvagante Sep 3, 2017
5ac2f14
Added .github files
alvagante Sep 3, 2017
31aef9c
Default params back in base classes. Renamed enable/manage switch
alvagante Sep 4, 2017
576df83
Merge branch 'development' of github.com:example42/psick into develop…
alvagante Sep 4, 2017
dbd9c36
Refactoring pre classes
alvagante Sep 4, 2017
c56e598
Minors
alvagante Sep 4, 2017
7772c64
Merge branch 'development' of github.com:example42/psick into develop…
alvagante Sep 4, 2017
9407be3
Fix .gitlab-ci.yml syntax
alvagante Sep 4, 2017
e57ae50
Remove data in modules for core profile classes
alvagante Sep 5, 2017
ff22a5a
Merge branch 'development' of github.com:example42/psick into develop…
alvagante Sep 5, 2017
49243ec
Added puppetlabs-apt dependency on Puppetfile
alvagante Sep 5, 2017
615af79
Removed spurious chars
alvagante Sep 5, 2017
5875e1a
FIx r10k check
alvagante Sep 5, 2017
e0c6e3d
Lint
alvagante Sep 5, 2017
a3df474
use correct puppetserver gem command to install gems
Sep 5, 2017
82c5585
Merge pull request #148 from example42/fix_puppetserver_gem_install
alvagante Sep 5, 2017
4a014d1
Lints
alvagante Sep 5, 2017
9fa4e84
Merge branch 'development' of github.com:example42/psick into develop…
alvagante Sep 5, 2017
3c8840a
Preparing for 0.2.1
alvagante Sep 5, 2017
ed8f498
Minors to skip errors
alvagante Sep 5, 2017
c6ab9f4
More profiles refactoring. Try with 4.6 compatibility
alvagante Sep 5, 2017
04d70ee
Fixing failed tests
alvagante Sep 5, 2017
dbe9485
Solve issue with duplicated resource
alvagante Sep 6, 2017
6c234d1
Many changes in the pipeline, some params names changes: bigger versi…
alvagante Sep 6, 2017
d4b6f86
Merge branch 'development' of github.com:example42/psick into develop…
alvagante Sep 6, 2017
4525583
Working on CI
alvagante Sep 6, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
## Really want to contribute to PSICK?!?

### Supply your own profile

One of the main components of PSICK is the collection of profiles, and the framework to easily switch from one to another.

We encourage the existence of multiple profiles to manage applications ussing different patterns and modules, we think it would be nice to have a good library of profiles to choose from and customise when needed.

So if you have written a good profile, which may adapt to common use cases, both for new or existing applications, you're welcomed to share it:

* the profile class
* some hiera examples
* enventual modules to add to Puppetfile
* possibly spec test for the profile

### Submit your bug or feature request

We are not suprised. There are so many combinations of OS, applications and use cases, that it's hard to test them all.

We still welcome bug fix or feature requests, even better relevant PR, we want to make PSICK as good and useful as possible,

### Contribution guideline

* Open a new GitHub pull request with the patch.
1. Fork this project
1. Create your feature branch: `git checkout -b my-new-feature`
1. Commit your changes: `git commit -am 'Add some feature'`
1. Push to the branch: `git push origin my-new-feature`
1. Submit a pull request via GitHub's web interface
* Ensure the PR description clearly describes the problem and its solution. Include the relevant issue number if applicable.

### Commercial support

If you need an enterprise level support on your Puppet infrastructure and may be interested in using some of all the PSICK features, you can contribute to this project by subscribing to example42 Puppet support services and, possibily, allowing us to share here the shareable work we do with you.

19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Expected Behavior


## Actual Behavior


## Steps to Reproduce the Problem

1.
1.
1.

## Specifications

Please add this info:

1. Output of ```facter -p``` on the failing node (at least the OS related facts)
1. Version of Puppet and of the module
1. The relevant Puppet code and eventually Hiera data
11 changes: 11 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## Before submitting your PR

1. Open an **issue** and refer to its number in your PR title
1. If it's a bug and you have the solution, go on with the PR!
1. If it's a new profile got with the PR (possibly with docs, samples and tests)

## After submitting your PR

1. Verify Travis checks and fix the errors if needed
1. Feel free to ping us if we don't reply promptly

128 changes: 19 additions & 109 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ stages:
# Run Danger based on Dangerfile rules
run_danger:
stage: danger
before_pre:
before_script:
- export DANGER_GITLAB_HOST=$CI_SERVER_NAME
- export DANGER_GITLAB_API_BASE_URL="https://${CI_SERVER_NAME}/api/v4"
script: danger --verbose
tags:
- test_puppet
allow_failure: true
except:
- testing
- production
only:
- branches
Expand Down Expand Up @@ -64,7 +63,6 @@ syntax:
tags:
- test_puppet
except:
- testing
- production
only:
- branches
Expand All @@ -84,7 +82,6 @@ lint:
tags:
- test_puppet
except:
- testing
- production
only:
- branches
Expand All @@ -102,8 +99,10 @@ rake_site:
- vagrant/environments/ci/.vagrant/
tags:
- test_puppet
except:
- production
only:
- development
- branches
allow_failure: true

rake_modules:
Expand All @@ -119,37 +118,38 @@ rake_modules:
tags:
- test_puppet
only:
- development
- integration
allow_failure: true
when: manual

catalog_diff:
stage: diffs
before_script:
- "bin/gitlab_before.sh"
script: "bin/gitlab_catalog_diff.sh development"
script: "bin/gitlab_catalog_diff.sh integration"
cache:
untracked: true
paths:
- modules/
tags:
- deploy_puppet
only:
- development
- integration
allow_failure: true

catalog_preview:
stage: diffs
before_script:
- "bin/gitlab_before.sh"
script: "bin/gitlab_catalog_preview.sh development"
script: "bin/gitlab_catalog_preview.sh integration"
cache:
untracked: true
paths:
- modules/
tags:
- deploy_puppet
only:
- development
- integration
allow_failure: true

# Can be duplicated to use different images (using different --image)
Expand All @@ -167,103 +167,22 @@ docker_test:
tags:
- test_puppet
only:
- development

# Destroy a vagrant machine completely.
vagrant_destroy:
stage: integration
before_script:
- "bin/gitlab_before.sh"
script: "bin/vagrant_node_test.sh centos7.ci ci destroy"
cache:
untracked: true
paths:
- modules/
- tests/
allow_failure: true
tags:
- test_puppet
only:
- development
when: manual


# Do Vagrant run. Start the machine, run the tests, halt the machine.
# This will use a .vagrant dir under $HOME of the users so that
# it will not be deleted accidentally by gitlab-runner
vagrant_checks:
stage: integration
before_script:
- "bin/gitlab_before.sh"
script:
- "bin/vagrant_node_test.sh centos7.ci ci setup"
- "bin/vagrant_node_test.sh centos7.ci ci drift"
after_script:
- "bin/gitlab_after.sh"
- "bin/vagrant_node_test.sh centos7.ci ci halt"
cache:
untracked: true
paths:
- modules/
- tests/
allow_failure: true
tags:
- test_puppet
only:
- development
when: manual

tp_test:
stage: integration
before_script:
- "bin/gitlab_before.sh"
script: "bin/gitlab_tp_test.sh development"
cache:
untracked: true
paths:
- modules/
- tests/
tags:
- test_puppet
only:
- development
allow_failure: true

# Development to testing merge request creation
merge_request_testing:
stage: merge_request
script: "bin/gitlab_create_merge_request.rb development testing"
tags:
- deploy_puppet
only:
- development

# Automatic Accept merge request from Development to testing
merge_accept_testing:
stage: promote
script: "bin/gitlab_accept_merge_request.rb development testing"
only:
- development
tags:
- deploy_puppet
when: on_success
allow_failure: true
- integration

# On testing branch
run_puppet_on_testing:
run_puppet_on_integration:
stage: live_runs
before_script:
# Trigger remote Puppet runs via puppet job
- "bin/puppet_job_run.sh testing"
- "bin/puppet_job_run.sh integration"
# Trigger remote Puppet runs via Rundeck
# - "bin/rundeck_job_run.sh testing"
script:
- "bin/puppetdb_env_query.sh testing"
- "bin/puppetdb_env_query.sh integration"
tags:
- deploy_puppet
when: on_success
only:
- testing
- integration
allow_failure: true

# Allow Merge Request to fail as it can happen that there's
Expand All @@ -272,22 +191,22 @@ run_puppet_on_testing:
merge_request_production:
stage: merge_request
script:
- "bin/gitlab_create_merge_request.rb testing production"
- "bin/gitlab_create_merge_request.rb integration production"
when: on_success
tags:
- deploy_puppet
only:
- testing
- integration
allow_failure: true

merge_accept_production:
stage: promote
script: "bin/gitlab_accept_merge_request.rb testing production"
script: "bin/gitlab_accept_merge_request.rb integration production"
tags:
- deploy_puppet
when: manual
only:
- testing
- integration
environment:
name: production

Expand Down Expand Up @@ -317,15 +236,6 @@ run_puppet_on_production:
allow_failure: true # TOREMOVE when fixed


test_post_run_on_production:
stage: postcheck
script: "bin/puppetdb_env_query.sh production"
tags:
- deploy_puppet
only:
- production
allow_failure: true # TOREMOVE when fixed

pages:
stage: sitedoc
before_script:
Expand Down
Loading