diff --git a/Gemfile b/Gemfile index ed878f1..e9584ba 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['<= 5.5.6'] -gem 'metadata-json-lint' +gem 'metadata-json-lint', '~> 2.4' gem 'puppet', puppetversion gem 'puppetlabs_spec_helper', '>= 1.0.0' gem 'puppet-lint' @@ -9,11 +9,12 @@ gem 'facter' gem 'rspec-puppet' gem 'yard' gem 'puppet-strings', '< 2.0.0' +gem 'rake', '~> 12.3', '>= 12.3.3' gem 'semantic_puppet' gem 'rgen' gem 'public_suffix', '<= 2.0.5' gem 'parallel', '<= 1.13.0' -gem 'rake', '~> 12.3', '>= 12.3.3' +gem 'puppet-syntax', '~> 2.6', '>= 2.6.1' # rspec must be v2 for ruby 1.8.7 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' diff --git a/Jenkinsfile b/Jenkinsfile index 9a183d4..92c2897 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,9 +3,24 @@ pipeline { label 'puppet' } + post { + always { + deleteDir() /* clean up our workspace */ + } + success { + updateGitlabCommitStatus state: 'success' + echo 'Pipeline finished successfully!' + } + failure { + updateGitlabCommitStatus state: 'failed' + echo 'I failed :(' + step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true]) + } + } + stages { - stage('pulling master before adding files') { + stage('pulling master') { steps { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sh '''git config user.name "Jenkins Server" @@ -53,7 +68,7 @@ pipeline { stage('compiler warnings') { steps { - warnings canComputeNew: false, canResolveRelativePaths: false, consoleParsers: [[parserName: 'Puppet-Lint']], defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', messagesPattern: '', unHealthy: '' + scanForIssues tool: puppetLint() } } @@ -70,124 +85,7 @@ pipeline { } } - stage('create changelog') { - steps{ - step([$class: 'GitChangelogRecorder', config: [configFile: 'git-changelog-settings.json', createFileTemplateContent: '''

Git Changelog changelog

- -

-Changelog of Git Changelog. -

- -{{#tags}} -

{{name}}

- {{#issues}} - {{#hasIssue}} - {{#hasLink}} -

{{name}} {{issue}} {{title}}

- {{/hasLink}} - {{^hasLink}} -

{{name}} {{issue}} {{title}}

- {{/hasLink}} - {{/hasIssue}} - {{^hasIssue}} -

{{name}}

- {{/hasIssue}} - - {{#commits}} -{{hash}} {{authorName}} {{commitTime}} -

-

{{{messageTitle}}}

- -{{#messageBodyItems}} -
  • {{.}}
  • -{{/messageBodyItems}} -

    - {{/commits}} - - {{/issues}} -{{/tags}} -''', createFileTemplateFile: '', createFileUseTemplateContent: true, createFileUseTemplateFile: false, customIssues: [[link: '', name: '', pattern: '', title: ''], [link: '', name: '', pattern: '', title: '']], dateFormat: 'YYYY-MM-dd HH:mm:ss', file: 'CHANGELOG.md', fromReference: '', fromType: 'firstCommit', gitHubApi: '', gitHubApiTokenCredentialsId: '', gitHubIssuePattern: '#([0-9]+)', gitHubToken: '', gitLabApiTokenCredentialsId: '', gitLabProjectName: '', gitLabServer: '', gitLabToken: '', ignoreCommitsIfMessageMatches: '^\\[maven-release-plugin\\].*|^\\[Gradle Release Plugin\\].*|^Merge.*', ignoreCommitsWithoutIssue: false, ignoreTagsIfNameMatches: '''__NOTOC__ - -= Git Changelog changelog = -Changelog of Git Changelog. - -{{#tags}} -== {{name}} == - {{#issues}} - {{#hasIssue}} - {{#hasLink}} -=== {{name}} [{{link}} {{issue}}] {{title}} === - {{/hasLink}} - {{^hasLink}} -=== {{name}} {{issue}} {{title}} === - {{/hasLink}} - {{/hasIssue}} - {{^hasIssue}} -=== {{name}} === - {{/hasIssue}} - - {{#commits}} -[https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}} - -\'\'\'{{{messageTitle}}}\'\'\' - -{{#messageBodyItems}} - * {{.}} -{{/messageBodyItems}} - - {{/commits}} - - {{/issues}} -{{/tags}} -

    Git Changelog changelog

    - -

    -Changelog of Git Changelog. -

    - -{{#tags}} -

    {{name}}

    - {{#issues}} - {{#hasIssue}} - {{#hasLink}} -

    {{name}} {{issue}} {{title}}

    - {{/hasLink}} - {{^hasLink}} -

    {{name}} {{issue}} {{title}}

    - {{/hasLink}} - {{/hasIssue}} - {{^hasIssue}} -

    {{name}}

    - {{/hasIssue}} - - - {{#commits}} -{{hash}} {{authorName}} {{commitTime}} -

    -

    {{{messageTitle}}}

    - -{{#messageBodyItems}} -
  • {{.}}
  • -{{/messageBodyItems}} -

    - - - {{/commits}} - - {{/issues}} -{{/tags}} -''', showSummaryTemplateFile: '', showSummaryUseTemplateContent: false, showSummaryUseTemplateFile: false, subDirectory: '', timeZone: 'UTC', toReference: '', toType: 'master', untaggedName: 'Unreleased', useConfigFile: false, useFile: true, useIgnoreTagsIfNameMatches: false, useJira: false, , useReadableTagName: false, useSubDirectory: false]]) - - } - } - - stage('show diff') { - steps { - sh 'git diff' - } - } - - stage('recommit changes to repo') { + stage('update repo') { steps { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sh '''git config user.name "Jenkins Server" @@ -198,29 +96,4 @@ Changelog of Git Changelog. } } } - - post { - always { - deleteDir() /* clean up our workspace */ - } - success { - echo 'Pipeline finished successfully!' - updateGitlabCommitStatus name: 'build', state: 'success' - } - unstable { - echo 'I am unstable :/' - } - failure { - echo 'I failed :(' - step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true]) - updateGitlabCommitStatus name: 'build', state: 'failed' - } - changed { - echo 'Things were different before...' - mail bcc: '', body: "Pipeline Job '${JOB_NAME}' has changed, please verify.", cc: '', from: '', replyTo: '', subject: "Pipeline Job '${JOB_NAME}' has changed", to: 'support@confdroid.com' - } - } - options { - gitLabConnection('Gitlab Confdroid') - } } diff --git a/README.md b/README.md index 1597ca3..2f30b47 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -|Repo Name| version | Build Status| -|---|---|---|---| -|`cd_clamav`| 0.0.0.1 | [![Build Status](https://pipelines.confdroid.com/buildStatus/icon?job=cd_clamav)](https://pipelines.confdroid.com/job/cd_clamav/)| +(https://pipelines.confdroid.com/buildStatus/icon?job=cd_clamav)](https://pipelines.confdroid.com/job/cd_clamav/)| ### Synopsis `Clamav` is a powerful antivirus scanner with several components. @@ -25,7 +23,6 @@ * [Known Problems](#known-problems) * [Support](#support) * [Tests](#tests) -* [Changelog](https://gitlab.confdroid.com/12WW1160/cd_clamav/blob/master/CHANGELOG.md) * [Contact Us](https://confdroid.com/contact/) * [Disclaimer](#disclaimer)