confdroid/confdroid_apache
3
0
Fork 0
Code Issues Projects Wiki Activity

added dev branch

Browse Source
This commit is contained in:
Arne Teuke
2018-04-10 12:56:10 +02:00
parent 355409a1c9
commit 5009ae57d9
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@@ -11,6 +11,7 @@ gem 'puppet-strings'
gem 'rake' gem 'rake'
gem 'semantic_puppet' gem 'semantic_puppet'
gem 'rgen' gem 'rgen'
gem 'public_suffix', '<= 2.0.5'
# rspec must be v2 for ruby 1.8.7 # rspec must be v2 for ruby 1.8.7
if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
@@ -18,5 +19,5 @@ if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
gem 'rake', '~> 10.0' gem 'rake', '~> 10.0'
else else
# rubocop requires ruby >= 1.9 # rubocop requires ruby >= 1.9
gem 'rubocop' gem 'rubocop', '<= 0.50.0'
end end

13
Jenkinsfile vendored
View File

@@ -7,7 +7,7 @@ pipeline {
stage('pulling master before adding files') { stage('pulling master before adding files') {
steps { steps {
sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh '''git config user.name "Jenkins Server" sh '''git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com git config user.email jenkins@confdroid.com
git pull origin master git pull origin master
@@ -24,10 +24,11 @@ pipeline {
stage('puppet-lint tests') { stage('puppet-lint tests') {
steps { steps {
sh '''find . -iname *.pp -exec puppet-lint \\ sh '''find . -iname *.pp -exec /var/lib/jenkins/bin/puppet-lint \\
--no-class_inherits_from_params_class-check \\ --no-class_inherits_from_params_class-check \\
--no-variable_scope-check \\ --no-variable_scope-check \\
--no-80chars-check \\ --no-80chars-check \\
--no-140chars-check \\
--no-arrow_alignment-check \\ --no-arrow_alignment-check \\
--no-autoloader_layout-check \\ --no-autoloader_layout-check \\
--log-format "%{path}:%{line}:%{check}:%{KIND}:%{message}" {} \\;''' --log-format "%{path}:%{line}:%{check}:%{KIND}:%{message}" {} \\;'''
@@ -96,7 +97,7 @@ Changelog of Git Changelog.
{{#commits}} {{#commits}}
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/{{hash}}">{{hash}}</a> {{authorName}} <i>{{commitTime}}</i> <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/{{hash}}">{{hash}}</a> {{authorName}} <i>{{commitTime}}</i>
<p> <p>
<h3>{{{messageTitle}}}</h3> <h3>{{{messageTitle}}}</h3>
@@ -129,7 +130,7 @@ Changelog of Git Changelog.
{{/hasIssue}} {{/hasIssue}}
{{#commits}} {{#commits}}
[https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}} [https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}}
\'\'\'{{{messageTitle}}}\'\'\' \'\'\'{{{messageTitle}}}\'\'\'
@@ -202,9 +203,11 @@ Changelog of Git Changelog.
} }
} }
stage('recommit changes to repo') { stage('recommit changes to repo') {
steps { steps {
sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh '''git config user.name "Jenkins Server" sh '''git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com git config user.email jenkins@confdroid.com
echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"` echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"`