jenkins scripting

1 files changed, 9 insertions, 4 deletions

diff --git a/ci-script.py b/ci-script.py
index 0e8ef6a..dccd677 100755
--- a/ci-script.py
+++ b/ci-script.py
@@ -17,9 +17,9 @@ def run_shell_command(cmd):
     return subprocess.check_output(cmd, shell=True)
 
 
-def read_manifests():
+def read_manifests(env):
     manifests = {}
-    manifests_glob = "%s/manifests/*.yaml" % os.path.dirname(os.path.realpath(__file__))
+    manifests_glob = "%s/*.yaml" % env.manifests_path
     for manifest_file in glob.glob(manifests_glob):
         with open(manifest_file, "r") as myfile:
             manifest = yaml.load(myfile.read())
@@ -54,8 +54,9 @@ def main(args):
                       args.os_user_domain_name,
                       args.os_identity_api_version,
                       args.os_image_api_version,
-                      args.elements_path)
-    manifests = read_manifests()
+                      args.elements_path,
+                      args.manifests_path)
+    manifests = read_manifests(env)
     keystone = Keystone(env)
     glance = Glance(keystone, endpoint_type="publicURL")
     for image_name, manifest in manifests.items():
@@ -109,6 +110,10 @@ if __name__ == "__main__":
                         required=False,
                         default=os.environ.get("ELEMENTS_PATH", None),
                         help="diskimage-builder environment variable: ELEMENTS_PATH")
+    parser.add_argument("--manifests-path",
+                        required=False,
+                        default=os.environ.get("MANIFESTS_PATH", None),
+                        help="image-foundry environment variable: MANIFESTS_PATH")
     args = parser.parse_args()
     main(args)
     sys.exit(0)