Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Bug 997763 #438

Merged
merged 3 commits into from Aug 20, 2013
Merged

Bug 997763 #438

merged 3 commits into from Aug 20, 2013

Conversation

fabianofranz
Copy link
Member

No description provided.

end

def jenkins_client_cartridges
filter_cartridges { |c| (c.tags || []).include?('ci_builder') && c.name =~ /jenkins.*/ }.sort
Copy link
Contributor

Choose a reason for hiding this comment

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

You need to raise if the cartridge isn't there

raise JenkinsNotInstalledOnServer, "There is no installed cartridge that exposes Jenkins"

and a separate one for jenkins. Also, i would recommend

c.name.downcase.include? "jenkins"

rather than the regex

Copy link
Contributor

Choose a reason for hiding this comment

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

Needs a test case exposing the failure case.

Copy link
Member Author

Choose a reason for hiding this comment

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

Cool. What about
c.name =~ /jenkins./im
(regex ignoring case). Also note this regex will match if name *starts
with 'jenkins' (different than 'include?').
/me <3 regex :)

Copy link
Contributor

Choose a reason for hiding this comment

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

If you're going to do starts_with, use /\Ajenkins/i. We should never have multiline names, and \A is clearer than the greedy .*

@fabianofranz
Copy link
Member Author

@smarterclayton review again please

@smarterclayton
Copy link
Contributor

Reviewed, [merge]

@openshift-bot
Copy link

Online Merge Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/test_pull_requests/4010/) (Image: devenv_3681)

@openshift-bot
Copy link

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link

Origin Test Results: Waiting for stable build of 'origin_ami'

@openshift-bot
Copy link

@openshift-bot
Copy link

Evaluated for online up to 733e20d

openshift-bot pushed a commit that referenced this pull request Aug 20, 2013
@openshift-bot openshift-bot merged commit 8e8b107 into openshift:master Aug 20, 2013
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.

None yet

3 participants