Skip to content

Commit

Permalink
Always update the URL in mesos cloud config (mesosphere#252)
Browse files Browse the repository at this point in the history
* Always update the URL in mesos cloud config

The assigned port is dynamic and may change between runs.

* Always update Jenkins URL
  • Loading branch information
colin-msphere authored Jun 26, 2018
1 parent 742d1cc commit 971eb3d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def populate_jenkins_config_xml(config_xml, master, name, port, role, user):
_find_and_set(mesos, './master', master)
_find_and_set(mesos, './frameworkName', name)
# This used to be host and port. Switching over to DNS Name to address COPS-3395.
_find_and_set(mesos, './jenkinsURL', marathon_autoip_dns_url.format(name, port), True)
_find_and_set(mesos, './jenkinsURL', marathon_autoip_dns_url.format(name, port))
_find_and_set(mesos, './role', role)
_find_and_set(mesos, './slavesUser', user)

Expand All @@ -51,7 +51,7 @@ def populate_jenkins_location_config(location_xml, url):
:type url: str
"""
tree, root = _get_xml_root(location_xml)
_find_and_set(root, 'jenkinsUrl', url, True)
_find_and_set(root, 'jenkinsUrl', url)
tree.write(location_xml)


Expand Down

0 comments on commit 971eb3d

Please sign in to comment.