aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Copeland <ben.copeland@linaro.org>2017-10-25 16:12:24 +0100
committerBen Copeland <ben.copeland@linaro.org>2017-10-25 16:12:24 +0100
commit74a3894f76ed2f35584fa1a2a7bcfc21f8efa4d7 (patch)
tree70b0a65bdf3dfb5521c0d19e4efbe4a1951d8c1d
parentc86bcf2b8f80fe326423ffe6d250d6b99d4d7c73 (diff)
downloadci-yadp-builder-74a3894f76ed2f35584fa1a2a7bcfc21f8efa4d7.tar.gz
Fix README.md URL and add helper comment to the URL argument
-rw-r--r--README.md2
-rwxr-xr-xyadp_builder.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 49bb0e6..57d3d7b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Yet Another Docker Plugin config builder
=======
-Yet Another Docker Plugib (yadp) is extremely hard to manage, when running multiple slaves with multiple images. Due to the way Jenkins displays the configuration page. YADP provides a [!groovy script](https://github.com/samrocketman/jenkins-bootstrap-jervis/blob/master/settings.groovy.EXAMPLE) which builds a json array to populate the config in Jenkins.
+Yet Another Docker Plugib (yadp) is extremely hard to manage, when running multiple slaves with multiple images. Due to the way Jenkins displays the configuration page. YADP provides a [groovy script](https://github.com/KostyaSha/yet-another-docker-plugin/blob/master/docs/script-console-scripts/configure-yadocker-cloud.groovy) which builds a json array to populate the config in Jenkins.
This script uses yaml and jinja2 to generate a java jsonarray to build the configuration, using a !include constructor in the yaml file, allowing the ability to template up docker_images, since many of our slaves run the same image, it lessens repetition.
diff --git a/yadp_builder.py b/yadp_builder.py
index 98ef423..7a6e6eb 100755
--- a/yadp_builder.py
+++ b/yadp_builder.py
@@ -61,7 +61,7 @@ def get_parser():
help='Password for Jenkins server')
parser.add_argument('-s', '--server', type=str,
default='https://ci.linaro.org',
- help='Jenkins server URL')
+ help='Jenkins server URL. e.g. http://localhost:8080')
parser.add_argument('-i', '--inventory', type=str, default='hosts.yml',
help='specify inventory host path')
parser.add_argument('-l', '--loglevel', default='INFO',