This repository has been archived by the owner on Oct 23, 2024. It is now read-only.
Discover jenkins with autoip host name instead of host:port #249
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scripts/bootstrap.py
Outdated
| @@ -30,7 +30,8 @@ def populate_jenkins_config_xml(config_xml, master, name, host, port, role, user | |||
|
|
|||
| _find_and_set(mesos, './master', master) | |||
| _find_and_set(mesos, './frameworkName', name) | |||
| _find_and_set(mesos, './jenkinsURL', "http://{}:{}".format(host, port)) | |||
| # This used to be host and port. Switching over to DNS Name to address COPS-3395. | |||
| _find_and_set(mesos, './jenkinsURL', "http://{}.marathon.autoip.dcos.thisdcos.directory".format(name)) | |||
There was a problem hiding this comment.
Can the format string ("http://{}.marathon.autoip.dcos.thisdcos.directory") be a constant at the top of the file? It is used again on line 121.
scripts/bootstrap.py
Outdated
| @@ -12,7 +12,7 @@ | |||
| import xml.etree.ElementTree as ET | |||
|
|
|||
|
|
|||
| def populate_jenkins_config_xml(config_xml, master, name, host, port, role, user): | |||
| def populate_jenkins_config_xml(config_xml, master, name, role, user): | |||
There was a problem hiding this comment.
The function documentation needs updated with these changes.
scripts/bootstrap.py
Outdated
| @@ -30,7 +30,8 @@ def populate_jenkins_config_xml(config_xml, master, name, host, port, role, user | |||
|
|
|||
| _find_and_set(mesos, './master', master) | |||
| _find_and_set(mesos, './frameworkName', name) | |||
| _find_and_set(mesos, './jenkinsURL', "http://{}:{}".format(host, port)) | |||
| # This used to be host and port. Switching over to DNS Name to address COPS-3395. | |||
| _find_and_set(mesos, './jenkinsURL', "http://{}.marathon.autoip.dcos.thisdcos.directory".format(name)) | |||
There was a problem hiding this comment.
The Universe config for Jenkins defines two ports and this used to specifically use the nginx port. How is the DNS address selecting the correct port?
| @@ -158,7 +159,7 @@ def _get_xml_root(config_xml): | |||
| return tuple([tree, root]) | |||
|
|
|||
|
|
|||
| def _find_and_set(element, term, new_text): | |||
| def _find_and_set(element, term, new_text, write_if_empty=False): | |||
There was a problem hiding this comment.
Please update the pydoc with the new argument.
|
What versions of DC/OS support the |
colin-msphere
approved these changes
Jun 22, 2018
colin-msphere
pushed a commit
that referenced
this pull request
Jun 25, 2018
colin-msphere
added a commit
that referenced
this pull request
Jun 26, 2018
* Update mesos plugin hash to include instrumentation * Update default agent to 0.6.0 (#207) * Update mesos plugin (#210) * Update jackson plugin to latest * Discover jenkins with autoip host name instead of host:port (#249) Address [COPS-3395](https://jira.mesosphere.com/browse/COPS-3395) * Always update the URL in mesos cloud config (#252) * Always update the URL in mesos cloud config The assigned port is dynamic and may change between runs. * Always update Jenkins URL
kvish
added a commit
that referenced
this pull request
Sep 29, 2019
* Fixes from master applied to 3.5.x (#251) * Update mesos plugin hash to include instrumentation * Update default agent to 0.6.0 (#207) * Update mesos plugin (#210) * Update jackson plugin to latest * Discover jenkins with autoip host name instead of host:port (#249) Address [COPS-3395](https://jira.mesosphere.com/browse/COPS-3395) * Always update the URL in mesos cloud config (#252) * Always update the URL in mesos cloud config The assigned port is dynamic and may change between runs. * Always update Jenkins URL * Update CHANGELOG for 3.5.1 (#253) * Changed Jenkins URL to support Jenkins when deployed to a MoM. (#261) * Fixing Mesos DNS name handling. (#273) * [COPS-4290] Bump jenkins base version and plugins (#283) * bump jenkins base tech 2.150.1 * Setting 'keepalive' for nginx Research has indicated that this could help reduce '504 timeout' errors and stress on the system when nginx is functioning as a revers proxy. Adding the server directives for keepalive as noted here: http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive * bump libmesos version * remove stale files * removing stale files * bump blue ocean plugins * updating jenkins lts release * bump branch api plugin * seperate plugins from dockerfile * seperate plugins * nit: newline * Bump plugins to help with jenkins timeouts (#286) * udate plugins and nginx * bump plugin * remove unused file * Fix Jenkins on strict mode (#290) * new LTS version of Jenkins (#292) blueocean 1.14.0 nginx 1.10.3 various plugin updates * new LTS version of Jenkins (#294) * new LTS version of Jenkins (#295)
kaiwalyajoshi
pushed a commit
that referenced
this pull request
Oct 3, 2019
* Fixes from master applied to 3.5.x (#251) * Update mesos plugin hash to include instrumentation * Update default agent to 0.6.0 (#207) * Update mesos plugin (#210) * Update jackson plugin to latest * Discover jenkins with autoip host name instead of host:port (#249) Address [COPS-3395](https://jira.mesosphere.com/browse/COPS-3395) * Always update the URL in mesos cloud config (#252) * Always update the URL in mesos cloud config The assigned port is dynamic and may change between runs. * Always update Jenkins URL * Update CHANGELOG for 3.5.1 (#253) * Changed Jenkins URL to support Jenkins when deployed to a MoM. (#261) * Fixing Mesos DNS name handling. (#273) * [COPS-4290] Bump jenkins base version and plugins (#283) * bump jenkins base tech 2.150.1 * Setting 'keepalive' for nginx Research has indicated that this could help reduce '504 timeout' errors and stress on the system when nginx is functioning as a revers proxy. Adding the server directives for keepalive as noted here: http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive * bump libmesos version * remove stale files * removing stale files * bump blue ocean plugins * updating jenkins lts release * bump branch api plugin * seperate plugins from dockerfile * seperate plugins * nit: newline * Bump plugins to help with jenkins timeouts (#286) * udate plugins and nginx * bump plugin * remove unused file * Fix Jenkins on strict mode (#290) * new LTS version of Jenkins (#292) blueocean 1.14.0 nginx 1.10.3 various plugin updates * new LTS version of Jenkins (#294) * new LTS version of Jenkins (#295) * Add gid, uid=99 for nobody user.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Address COPS-3395