diff options
| author |  Oliver Chang <ochang@chromium.org> | 2017-03-14 14:14:10 -0700 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2017-03-14 14:14:10 -0700 |
| commit | 5f0e92ab8d415195018869cd6da00a36a684654d (patch) | |
| tree | 8162156fe0d77f6088a97ecadae7dd32128a7c40 | |
| parent | ac2e937c8b4b202c229c65e663172a04a3f91ffa (diff) | |
Move gcb auto setup to infra/gcb.
| -rw-r--r-- | infra/gcb/jenkins_config/base_job.xml (renamed from infra/auto-setup/jenkins_config/base_job_gcb.xml) | 0 | ||||
| -rw-r--r-- | infra/gcb/requirements.txt | 1 | ||||
| -rwxr-xr-x | infra/gcb/sync.py (renamed from infra/auto-setup/sync_gcb.py) | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/infra/auto-setup/jenkins_config/base_job_gcb.xml b/infra/gcb/jenkins_config/base_job.xml index efeab6f8..efeab6f8 100644 --- a/infra/auto-setup/jenkins_config/base_job_gcb.xml +++ b/infra/gcb/jenkins_config/base_job.xml diff --git a/infra/gcb/requirements.txt b/infra/gcb/requirements.txt index 870b77fa..7fb3669a 100644 --- a/infra/gcb/requirements.txt +++ b/infra/gcb/requirements.txt @@ -4,3 +4,4 @@ google-cloud-pubsub google-cloud-logging google-cloud-storage jinja2 +python-jenkins diff --git a/infra/auto-setup/sync_gcb.py b/infra/gcb/sync.py index 617e407b..dd59fead 100755 --- a/infra/auto-setup/sync_gcb.py +++ b/infra/gcb/sync.py @@ -86,7 +86,7 @@ def sync_jenkins_job(server, project): project_json_string = json.dumps(json.dumps(yaml.safe_load(f))) job_name = 'projects/' + project - with open(os.path.join(SCRIPT_DIR, 'jenkins_config', 'base_job_gcb.xml')) as f: + with open(os.path.join(SCRIPT_DIR, 'jenkins_config', 'base_job.xml')) as f: job_config_xml = f.read() if server.job_exists(job_name): |