Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/slave tunnel #840

Merged
merged 4 commits into from Feb 7, 2018
Merged

Conversation

jhooyberghs
Copy link
Contributor

Added tests for existing open PR "Add tunnel flag for slaves" #796

@jhooyberghs
Copy link
Contributor Author

Should also close #348

@@ -27,6 +27,11 @@
# [*executors*]
# Number of executors for this slave. (How many jenkins jobs can run simultaneously on this host.)
#
# [*tunnel*]
Copy link
Member

Choose a reason for hiding this comment

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

This looks great! If we used tunnel_host and tunnel_port it might be easier to validate the inputs and then we could compose $tunnel inside the class.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could, however then we would also need to verify if one of those have been given or not to see if you have to print something because
"HOSTNAME:"
":PORT"
"HOSTNAME:PORT"
are all valid, while ":" is not
(source https://github.com/jenkinsci/jenkins/blob/master/war/src/main/webapp/help/system-config/master-slave/jnlp-tunnel.html)

Copy link
Member

Choose a reason for hiding this comment

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

Gotcha, that part wasn't clear to me reading the doc string. Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

We could catch this using the data types. (regex magic maybe)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Like this @vStone?

Copy link
Contributor

Choose a reason for hiding this comment

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

<3

@@ -27,6 +27,11 @@
# [*executors*]
# Number of executors for this slave. (How many jenkins jobs can run simultaneously on this host.)
#
# [*tunnel*]
Copy link
Contributor

Choose a reason for hiding this comment

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

<3

@ghoneycutt
Copy link
Member

ghoneycutt commented Feb 7, 2018

Created jhooyberghs#1 to add some spec tests. You can see the diff at jhooyberghs@93ac390

It just adds tests for HOST: and :PORT.

Copy link
Member

@jhoblitt jhoblitt left a comment

Choose a reason for hiding this comment

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

LGTM.

@jhoblitt
Copy link
Member

jhoblitt commented Feb 7, 2018

The acceptance test failure should be "fixed" (marked as pending) on master.

@jhoblitt jhoblitt merged commit da9b80b into voxpupuli:master Feb 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants