diff --git a/Gemfile b/Gemfile index ba360ff..628327e 100644 --- a/Gemfile +++ b/Gemfile @@ -19,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}} -{{hash}} {{authorName}} {{commitTime}} +{{hash}} {{authorName}} {{commitTime}}

{{{messageTitle}}}

@@ -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"` diff --git a/README.md b/README.md index 4865b89..c3fb8c8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_selinux`| 0.0.1.1 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_selinux)](https://jenkins.confdroid.com/job/cd_selinux/)| +|`cd_selinux`| 0.0.1.1 | [![Build Status](https://pipelines.confdroid.com/buildStatus/icon?job=cd_selinux)](https://pipelines.confdroid.com/job/cd_selinux/)| ### Synopsis [Security-Enhanced Linux (SELinux) is a Linux kernel security module that provides a mechanism for supporting access control security policies.](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) @@ -12,7 +12,7 @@ ### Table of Contents * [Features](#features) -* [Repo Structure](https://gitlab.puppetsoft.com/12WW1160/cd_selinux/blob/master/REPOSTRUCTURE.md) +* [Repo Structure](https://gitlab.confdroid.com/12WW1160/cd_selinux/blob/master/REPOSTRUCTURE.md) * [Dependencies](#dependencies) * [Deployment](#deployment) * [native Puppet deployment](#native-puppet-deployment) @@ -24,7 +24,7 @@ * [Known Problems](#known-problems) * [Support](#support) * [Tests](#tests) -* [Changelog](https://gitlab.puppetsoft.com/12WW1160/cd_selinux/blob/master/CHANGELOG.md) +* [Changelog](https://gitlab.confdroid.com/12WW1160/cd_selinux/blob/master/CHANGELOG.md) * [Contact Us](https://confdroid.com/contact/) * [Disclaimer](#disclaimer) @@ -45,7 +45,7 @@ Repostructure has moved to REPOSTRUCTURE.md in repo. ### Dependencies All dependencies must be included in the catalogue. -* [cd_resources](https://gitlab.puppetsoft.com/12WW1160/cd_resources) for yum repo resources. +* [cd_resources](https://gitlab.confdroid.com/12WW1160/cd_resources) for yum repo resources. ### Deployment @@ -55,7 +55,7 @@ via site.pp or nodes.pp ``` node 'example.example.net' { - include cd_puppetdb + include cd_selinux } ``` #### through Foreman: