Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Fix Possum branch CI build #182

Merged
merged 10 commits into from Sep 29, 2017
Merged

Conversation

jtuttle
Copy link
Member

@jtuttle jtuttle commented Sep 29, 2017

Closes #181.

@ghost ghost assigned jtuttle Sep 29, 2017
@ghost ghost added the in progress label Sep 29, 2017
@dustinmm80 dustinmm80 self-requested a review September 29, 2017 19:16
Copy link
Contributor

@dustinmm80 dustinmm80 left a comment

Choose a reason for hiding this comment

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

The build is passing, yes!

But there are a few things to shore up before we merge.

@@ -10,7 +10,7 @@ COPY conjur-cli.gemspec conjur-cli.gemspec
COPY lib/conjur/version.rb lib/conjur/version.rb

# Make sure only one version of bundler is available
RUN gem uninstall bundler -i /usr/local/lib/ruby/gems/${RUBY_VERSION}.0 bundler || true && \
gem uninstall bundler -aIx && \
RUN gem uninstall bundler -i /usr/local/lib/ruby/gems/${RUBY_VERSION} bundler || true && \
Copy link
Contributor

Choose a reason for hiding this comment

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

why do we have to run gem uninstall bundler twice here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure, but it looks like it's once for the currently selected gemset and once for the version-specific gemset. No idea why this is necessary. Could try without the latter, perhaps.

Gemfile Outdated
@@ -8,4 +8,4 @@ gemspec

gem 'activesupport', '~> 4.2'

gem 'conjur-api', git: 'https://github.com/conjurinc/api-ruby.git', branch: 'possum'
gem 'conjur-api', '~> 5.0.0'
Copy link
Contributor

Choose a reason for hiding this comment

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

You can shorten this to '~> 5

Copy link
Member Author

Choose a reason for hiding this comment

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

Shortened.

Jenkinsfile Outdated
@@ -9,7 +9,7 @@ pipeline {
stages {
stage('Test 2.2') {
environment {
RUBY_VERSION = '2.2'
RUBY_VERSION = '2.2.0'
Copy link
Contributor

Choose a reason for hiding this comment

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

instead of 0s - often buggy releases - we should use the latest y versions, for ruby versions 2.x.y. This ensures that we're running against recent Rubies

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed to most recent 2.x version.

@@ -9,7 +9,7 @@ pipeline {
stages {
stage('Test 2.2') {
Copy link
Contributor

Choose a reason for hiding this comment

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

We should run these stages in parallel. I can add a commit to this PR showing how.

@ghost ghost assigned dustinmm80 Sep 29, 2017
@dustinmm80 dustinmm80 merged commit a018742 into possum Sep 29, 2017
@ghost ghost removed the in progress label Sep 29, 2017
@dustinmm80 dustinmm80 deleted the fix-possum-branch-ci-build--181 branch September 29, 2017 20:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants