Skip to content
This repository has been archived by the owner on Sep 24, 2019. It is now read-only.

(maint) fix acceptance bundle #72

Conversation

er0ck
Copy link
Contributor

@er0ck er0ck commented Apr 3, 2017

No description provided.

Eric Thompson added 3 commits April 3, 2017 16:35
* i guess we never got around to adding Gem building tasks
* previous change did not account for when x.y.z rake version strings were not specified.
* a previous commit removed the bundle on the SUT
* forgot to commit the changes to the test to not specify bundle exec
@er0ck er0ck requested a review from samwoods1 April 3, 2017 23:41
@er0ck er0ck changed the base branch from master to stable April 3, 2017 23:41
@er0ck er0ck force-pushed the fix/stable/maint-fix_acceptance_no_bundler_net-ssh_pin branch from 7b6885e to d32fc12 Compare April 4, 2017 18:33
@er0ck
Copy link
Contributor Author

er0ck commented Apr 4, 2017

@puppetlabs-jenkins retest this please

@er0ck er0ck changed the title (maint) fix acceptance no bundler net ssh pin (maint) DO NOT MERGE fix acceptance bundle Apr 4, 2017
Eric Thompson added 2 commits April 4, 2017 13:27
* we can't commit a Gemfile.lock as we sweep one of our deps (rake)
  * unit test job uses bundle install not bundle update
* pin some deps here.  next major we'll require ruby > 2
@er0ck er0ck force-pushed the fix/stable/maint-fix_acceptance_no_bundler_net-ssh_pin branch from d32fc12 to a65a3d9 Compare April 4, 2017 20:29
@er0ck er0ck changed the title (maint) DO NOT MERGE fix acceptance bundle (maint) fix acceptance bundle Apr 4, 2017
@@ -8,8 +8,9 @@
end
scp_to(sut, gem_name, gem_name)

rake_version = `rake --version`.split[2]
if ENV['RAKE_VER']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you're only relying on the 'rake --version' command now... should we remove this if statement?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point. but i think we want that there so it'll just install whatever version of rake on the SUT if we aren't using rake at all, locally, for instance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should probably check if $(which rake) or similar, but i dunno if i care enough to fix that for now.

@er0ck
Copy link
Contributor Author

er0ck commented Apr 4, 2017

@puppetlabs-jenkins retest this please

@er0ck
Copy link
Contributor Author

er0ck commented Apr 5, 2017

so this is failing ubuntu16 against rake 0.9 only. this is expected and will be remedied when this is merged: https://github.com/puppetlabs/ci-job-configs/pull/2651
(no need to test against 0.9)
@samwoods1 this is ready to go.

@er0ck er0ck force-pushed the fix/stable/maint-fix_acceptance_no_bundler_net-ssh_pin branch from d63d590 to 974dc6c Compare April 5, 2017 16:36
@samwoods1 samwoods1 merged commit 2a5b832 into puppetlabs:stable Apr 5, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants