fix jenkinsfile (via #1)

Artem Eroshenko · web-flow · commit 85fa3087c7e4 · 2019-05-21T20:07:54.000+03:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,10 @@ pipeline {
   }
   stages {
     stage('Install') {
-      steps { sh 'bundle install' }
+      steps {
+        sh 'gem install bundler -v 2.0.1'
+        sh 'bundle install' 
+      }
     }
     stage('Lint') {
       steps { sh 'bundle exec rake rubocop' }
@@ -19,12 +22,12 @@ pipeline {
         sh  'bundle exec rake release'
       }
     }
-    post {
-      always { deleteDir() }
-      failure {
-        slackSend message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} failed (<${env.BUILD_URL}|Open>)",
-                color: 'danger', teamDomain: 'qameta', channel: 'allure', tokenCredentialId: 'allure-channel'
-      }
+  }
+  post {
+    always { deleteDir() }
+    failure {
+      slackSend message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} failed (<${env.BUILD_URL}|Open>)",
+              color: 'danger', teamDomain: 'qameta', channel: 'allure', tokenCredentialId: 'allure-channel'
     }
   }
 }
diff --git a/allure-cucumber/Rakefile b/allure-cucumber/Rakefile
@@ -4,7 +4,7 @@ require "rspec/core/rake_task"
 require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:test) do |t|
-  t.rspec_opts = "--color --require spec_helper --tag ~reporter"
+  t.rspec_opts = "--color --require spec_helper --format documentation --tag ~reporter"
 end
 
 RuboCop::RakeTask.new(:rubocop) do |task|
diff --git a/allure-ruby-commons/Rakefile b/allure-ruby-commons/Rakefile
@@ -4,7 +4,7 @@ require "rspec/core/rake_task"
 require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:test) do |t|
-  t.rspec_opts = "--color --require spec_helper --tag ~reporter"
+  t.rspec_opts = "--color --require spec_helper --format documentation --tag ~reporter"
 end
 
 RuboCop::RakeTask.new(:rubocop) do |task|

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,10 @@ pipeline {`
`5`	`5`	`}`
`6`	`6`	`stages {`
`7`	`7`	`stage('Install') {`
`8`		`- steps { sh 'bundle install' }`
	`8`	`+ steps {`
	`9`	`+ sh 'gem install bundler -v 2.0.1'`
	`10`	`+ sh 'bundle install'`
	`11`	`+ }`
`9`	`12`	`}`
`10`	`13`	`stage('Lint') {`
`11`	`14`	`steps { sh 'bundle exec rake rubocop' }`
`@@ -19,12 +22,12 @@ pipeline {`
`19`	`22`	`sh 'bundle exec rake release'`
`20`	`23`	`}`
`21`	`24`	`}`
`22`		`- post {`
`23`		`- always { deleteDir() }`
`24`		`- failure {`
`25`		`- slackSend message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} failed (<${env.BUILD_URL}\|Open>)",`
`26`		`- color: 'danger', teamDomain: 'qameta', channel: 'allure', tokenCredentialId: 'allure-channel'`
`27`		`- }`
	`25`	`+ }`
	`26`	`+ post {`
	`27`	`+ always { deleteDir() }`
	`28`	`+ failure {`
	`29`	`+ slackSend message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} failed (<${env.BUILD_URL}\|Open>)",`
	`30`	`+ color: 'danger', teamDomain: 'qameta', channel: 'allure', tokenCredentialId: 'allure-channel'`
`28`	`31`	`}`
`29`	`32`	`}`
`30`	`33`	`}`