From 9edc2eccf98d53d0e6873af6cb19bf3e797af485 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 10 Jul 2019 13:51:50 +0200 Subject: [PATCH 1/2] Show the hammer gemset before testing --- .../theforeman.org/pipelines/release/source/hammer-cli-x.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/release/source/hammer-cli-x.groovy b/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/release/source/hammer-cli-x.groovy index b6d1692e6..4feae6303 100644 --- a/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/release/source/hammer-cli-x.groovy +++ b/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/release/source/hammer-cli-x.groovy @@ -80,6 +80,7 @@ def run_test(args) { try { configureRVM(ruby, gemset) withRVM(['bundle install --without=development --jobs=5 --retry=5'], ruby, gemset) + withRVM(['bundle show'], ruby, gemset) withRVM(['bundle exec rake ci:setup:minitest test TESTOPTS="-v"'], ruby, gemset) } finally { cleanupRVM(ruby, gemset) From c7c9edf95ae72bfece526195a952ed4b2b291f7b Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 10 Jul 2019 14:16:55 +0200 Subject: [PATCH 2/2] Append to the Gemfile.local Previously it was overwriting the entire file on every next gem. --- .../pipelines/release/source/hammer-cli-x.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/release/source/hammer-cli-x.groovy b/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/release/source/hammer-cli-x.groovy index 4feae6303..b6e853813 100644 --- a/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/release/source/hammer-cli-x.groovy +++ b/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/release/source/hammer-cli-x.groovy @@ -68,9 +68,11 @@ pipeline { } def add_hammer_cli_git_repos(repos = []) { + content = '' for(i = 0; i < repos.size(); i++) { - sh "echo 'gem \"${repos[i].replace('-', '_')}\", :github => \"theforeman/${repos[i]}\"' > Gemfile.local" + content += "gem '${repos[i].replace('-', '_')}', :github => 'theforeman/${repos[i]}'\n" } + writeFile(file: 'Gemfile.local', text: content) } def run_test(args) {