diff options
| -rwxr-xr-x | ci-script.py | 13 | ||||
| -rw-r--r-- | jjb/.gitignore | 3 | ||||
| -rw-r--r-- | jjb/example.ini | 13 | ||||
| -rw-r--r-- | jjb/requirements.txt | 1 | ||||
| -rwxr-xr-x | jjb/run.sh | 9 | ||||
| -rw-r--r-- | jjb/yaml/image-foundry.yaml | 25 | ||||
| -rw-r--r-- | libs/environment.py | 8 |
7 files changed, 15 insertions, 57 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) diff --git a/jjb/.gitignore b/jjb/.gitignore deleted file mode 100644 index bdcf3b6..0000000 --- a/jjb/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -pippiandcarlos.com.ini -verizoncloudplatform.com.ini -venv diff --git a/jjb/example.ini b/jjb/example.ini deleted file mode 100644 index d87a962..0000000 --- a/jjb/example.ini +++ /dev/null @@ -1,13 +0,0 @@ -[job_builder] -ignore_cache=True -keep_descriptions=False -include_path=.:scripts:~/git/ -recursive=False -exclude=.*:manual:./development -allow_duplicates=False - -[jenkins] -user=my_username -password=my_jenkins_api_key -url=http://jenkins.tld/ -query_plugins_info=False diff --git a/jjb/requirements.txt b/jjb/requirements.txt deleted file mode 100644 index 1d847f4..0000000 --- a/jjb/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -jenkins-job-builder>=2.0.0.0b2 diff --git a/jjb/run.sh b/jjb/run.sh deleted file mode 100755 index 34962f5..0000000 --- a/jjb/run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -ini="${1}" - -virtualenv venv -. venv/bin/activate -venv/bin/pip install --upgrade -r requirements.txt - -jenkins-jobs --conf "${ini}" update --delete-old yaml/ diff --git a/jjb/yaml/image-foundry.yaml b/jjb/yaml/image-foundry.yaml deleted file mode 100644 index 05b484d..0000000 --- a/jjb/yaml/image-foundry.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- job: - name: image-foundry - project-type: pipeline - dsl: | - pipeline { - agent { - node { - label "image_foundry" - } - } - stages { - stage("checkout-elements") { - steps { - git(poll: true, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/image-foundry-vzw.git") - } - } - stage("diskimage-builder") { - steps { - git(poll: true, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/image-foundry.git") - sh(script: "./ci-script.sh") - } - } - } - } diff --git a/libs/environment.py b/libs/environment.py index f78f3d1..7e9027f 100644 --- a/libs/environment.py +++ b/libs/environment.py @@ -14,6 +14,7 @@ class Environment(object): os_identity_api_version, os_image_api_version, elements_path, + manifests_path, extra_envs={}): if os_auth_url is None or \ os_project_name is None or \ @@ -24,7 +25,8 @@ class Environment(object): os_user_domain_name is None or \ os_identity_api_version is None or \ os_image_api_version is None or \ - elements_path is None: + elements_path is None or \ + manifests_path is None: print("All required environment arguments must have a value. You passed in:" + \ "\nos_auth_url = " + str(os_auth_url) + \ "\nos_project_name = " + str(os_project_name) + \ @@ -35,7 +37,8 @@ class Environment(object): "\nos_user_domain_name = " + str(os_user_domain_name) + \ "\nos_identity_api_version = " + str(os_identity_api_version) + \ "\nos_image_api_version = " + str(os_image_api_version) + \ - "\nelements_path = " + str(elements_path)) + "\nelements_path = " + str(elements_path) + \ + "\nmanifests_path = " + str(manifests_path)) sys.exit(1) else: self.os_auth_url = os_auth_url @@ -48,6 +51,7 @@ class Environment(object): self.os_identity_api_version = os_identity_api_version self.os_image_api_version = os_image_api_version self.elements_path = elements_path + self.manifests_path = manifests_path self.extra_envs = {} for key, value in [(k, v) for (k, v) in extra_envs.items() if v]: self.extra_envs[key] = value |