aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Copeland <ben.copeland@linaro.org>2018-02-20 15:31:17 +0000
committerBenjamin Copeland <ben.copeland@linaro.org>2018-02-20 15:47:31 +0000
commit3999b550aaa9d3e66ab8ccd041bb90c7169ebf8b (patch)
tree06a166ad34d4b379f3b25b2aec4c6180cafdb462
parentfb5914a095add11bbab66579fe8b070c31c6faa1 (diff)
YADP: Use username and password set in environ
Change-Id: Ie772a34dd6085d267552bd56e684ab87ad96664d
-rwxr-xr-xyadp_builder.py8
-rwxr-xr-xyadp_builder_v2.py8
2 files changed, 10 insertions, 6 deletions
diff --git a/yadp_builder.py b/yadp_builder.py
index 9f67623..1b49245 100755
--- a/yadp_builder.py
+++ b/yadp_builder.py
@@ -1,6 +1,6 @@
import argparse
import yaml
-import os.path
+import os
from jinja2 import FileSystemLoader, Environment
import jenkins
import logging
@@ -55,9 +55,11 @@ def jinja2_from_template(directory, template_name, data):
def get_parser():
parser = argparse.ArgumentParser()
- parser.add_argument('-u', '--username', type=str, required=True,
+ parser.add_argument('-u', '--username', type=str,
+ default=os.environ.get('JJB_USER'),
help='Username for Jenkins server')
- parser.add_argument('-p', '--password', type=str, required=True,
+ parser.add_argument('-p', '--password', type=str,
+ default=os.environ.get('JJB_PASSWORD'),
help='Password for Jenkins server')
parser.add_argument('-s', '--server', type=str,
default='http://localhost:8080',
diff --git a/yadp_builder_v2.py b/yadp_builder_v2.py
index ef945ad..62d60e7 100755
--- a/yadp_builder_v2.py
+++ b/yadp_builder_v2.py
@@ -1,6 +1,6 @@
import argparse
import yaml
-import os.path
+import os
from jinja2 import FileSystemLoader, Environment
import jenkins
import logging
@@ -40,9 +40,11 @@ def jinja2_from_template(directory, template_name, data):
def get_parser():
parser = argparse.ArgumentParser()
- parser.add_argument('-u', '--username', type=str, required=True,
+ parser.add_argument('-u', '--username', type=str,
+ default=os.environ.get('JJB_USER'),
help='Username for Jenkins server')
- parser.add_argument('-p', '--password', type=str, required=True,
+ parser.add_argument('-p', '--password', type=str,
+ default=os.environ.get('JJB_PASSWORD'),
help='Password for Jenkins server')
parser.add_argument('-s', '--server', type=str,
default='http://localhost:8080',