From 5009ae57d9173233380f4b279d5f767695c224e6 Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Tue, 10 Apr 2018 12:56:10 +0200
Subject: [PATCH] added dev branch

---
 Gemfile     |  3 ++-
 Jenkinsfile | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index f1c0ec8..628327e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,7 @@ gem 'puppet-strings'
 gem 'rake'
 gem 'semantic_puppet'
 gem 'rgen'
+gem 'public_suffix', '<= 2.0.5'
 
 # rspec must be v2 for ruby 1.8.7
 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'
 else
   # rubocop requires ruby >= 1.9
-  gem 'rubocop'
+  gem 'rubocop', '<= 0.50.0'
 end
diff --git a/Jenkinsfile b/Jenkinsfile
index e88dff1..f40a842 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
 
       stage('pulling master before adding files') {
         steps {
-          sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) {
+          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
             sh '''git config user.name "Jenkins Server"
                   git config user.email jenkins@confdroid.com
                   git pull origin master
@@ -24,10 +24,11 @@ pipeline {
 
       stage('puppet-lint tests') {
         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-variable_scope-check \\
             --no-80chars-check \\
+            --no-140chars-check \\
             --no-arrow_alignment-check \\
             --no-autoloader_layout-check \\
             --log-format "%{path}:%{line}:%{check}:%{KIND}:%{message}" {} \\;'''
@@ -96,7 +97,7 @@ Changelog of Git Changelog.
 
 
    {{#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>
 <h3>{{{messageTitle}}}</h3>
 
@@ -129,7 +130,7 @@ Changelog of Git Changelog.
   {{/hasIssue}}
 
    {{#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}}}\'\'\'
 
@@ -202,9 +203,11 @@ Changelog of Git Changelog.
         }
       }
 
+
+
       stage('recommit changes to repo') {
         steps {
-          sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) {
+          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
             sh '''git config user.name "Jenkins Server"
                   git config user.email jenkins@confdroid.com
                   echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"`