diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-05-20 09:44:05 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-05-20 09:44:05 +0000 |
commit | 4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 (patch) | |
tree | 3e6c6e7fda3501b8af7aec03aff10e4e43130859 /mason/share | |
parent | fab1f7a06fa8a5a6be1fabaec0e565802de498fc (diff) | |
download | definitions-4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994.tar.gz |
Install configuration files in the correct place
Also, have a more sensible default layout.yaml.
Diffstat (limited to 'mason/share')
-rw-r--r-- | mason/share/zuul/layout.yaml (renamed from mason/share/zuul-layout.yaml) | 13 | ||||
-rw-r--r-- | mason/share/zuul/logging.conf (renamed from mason/share/zuul-logging.conf) | 0 | ||||
-rw-r--r-- | mason/share/zuul/zuul.conf (renamed from mason/share/zuul.conf) | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/mason/share/zuul-layout.yaml b/mason/share/zuul/layout.yaml index a845a62f..31f999a5 100644 --- a/mason/share/zuul-layout.yaml +++ b/mason/share/zuul/layout.yaml @@ -1,5 +1,5 @@ pipelines: - - name: check + - name: check-change manager: IndependentPipelineManager trigger: gerrit: @@ -10,6 +10,12 @@ pipelines: failure: gerrit: verified: -1 + - name: post-commit + manager: IndependentPipelineManager + trigger: + gerrit: + - event: ref-updated + ref: ^(!?refs/).*$ jobs: - name: ^.*-merge$ @@ -17,6 +23,9 @@ jobs: projects: - name: baserock/baserock/definitions - check: + check-change: + - build: + - build_test + post-commit: - build: - build_test diff --git a/mason/share/zuul-logging.conf b/mason/share/zuul/logging.conf index 8b76da26..8b76da26 100644 --- a/mason/share/zuul-logging.conf +++ b/mason/share/zuul/logging.conf diff --git a/mason/share/zuul.conf b/mason/share/zuul/zuul.conf index 21066e70..5d837430 100644 --- a/mason/share/zuul.conf +++ b/mason/share/zuul/zuul.conf @@ -13,7 +13,8 @@ user={{ GERRIT_USER }} sshkey={{ GERRIT_SSH_KEY_PATH }} [zuul] -log_config=/etc/zuul-logging.conf +layout_config=/etc/zuul/layout.yaml +log_config=/etc/zuul/logging.conf pidfile=/var/run/zuul/zuul.pid state_dir=/var/lib/zuul git_dir=/var/lib/zuul/git |