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/zuul | |
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/zuul')
-rw-r--r-- | mason/share/zuul/layout.yaml | 31 | ||||
-rw-r--r-- | mason/share/zuul/logging.conf | 44 | ||||
-rw-r--r-- | mason/share/zuul/zuul.conf | 27 |
3 files changed, 102 insertions, 0 deletions
diff --git a/mason/share/zuul/layout.yaml b/mason/share/zuul/layout.yaml new file mode 100644 index 00000000..31f999a5 --- /dev/null +++ b/mason/share/zuul/layout.yaml @@ -0,0 +1,31 @@ +pipelines: + - name: check-change + manager: IndependentPipelineManager + trigger: + gerrit: + - event: patchset-created + success: + gerrit: + verified: 1 + failure: + gerrit: + verified: -1 + - name: post-commit + manager: IndependentPipelineManager + trigger: + gerrit: + - event: ref-updated + ref: ^(!?refs/).*$ + +jobs: + - name: ^.*-merge$ + failure-message: Unable to merge change, please rebase and try again. + +projects: + - name: baserock/baserock/definitions + check-change: + - build: + - build_test + post-commit: + - build: + - build_test diff --git a/mason/share/zuul/logging.conf b/mason/share/zuul/logging.conf new file mode 100644 index 00000000..8b76da26 --- /dev/null +++ b/mason/share/zuul/logging.conf @@ -0,0 +1,44 @@ +[loggers] +keys=root,zuul,gerrit + +[handlers] +keys=console,debug,normal + +[formatters] +keys=simple + +[logger_root] +level=WARNING +handlers=console + +[logger_zuul] +level=DEBUG +handlers=debug,normal +qualname=zuul + +[logger_gerrit] +level=DEBUG +handlers=debug,normal +qualname=gerrit + +[handler_console] +level=WARNING +class=StreamHandler +formatter=simple +args=(sys.stdout,) + +[handler_debug] +level=DEBUG +class=logging.handlers.TimedRotatingFileHandler +formatter=simple +args=('/var/log/zuul/debug.log', 'midnight', 1, 30,) + +[handler_normal] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=simple +args=('/var/log/zuul/zuul.log', 'midnight', 1, 30,) + +[formatter_simple] +format=%(asctime)s %(levelname)s %(name)s: %(message)s +datefmt= diff --git a/mason/share/zuul/zuul.conf b/mason/share/zuul/zuul.conf new file mode 100644 index 00000000..5d837430 --- /dev/null +++ b/mason/share/zuul/zuul.conf @@ -0,0 +1,27 @@ +[gearman] +server={{ GEARMAN_HOST }} +port={{ GEARMAN_PORT }} + +[gearman_server] +start={{ START_GEARMAN }} + +[gerrit] +server={{ GERRIT_HOSTNAME }} +port={{ GERRIT_GIT_PORT }} +baseurl=http://{{ GERRIT_HOSTNAME }}:{{ GERRIT_HTTP_PORT }} +user={{ GERRIT_USER }} +sshkey={{ GERRIT_SSH_KEY_PATH }} + +[zuul] +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 +status_url=http://127.0.0.1/logs + +[merger] +git_dir=/var/lib/zuul/git +git_user_email={{ GERRIT_USER }}@mason +git_user_name={{ GERRIT_USER }} +zuul_url=ssh://{{ GERRIT_USER }}@{{ GERRIT_HOSTNAME }}:{{ GERRIT_GIT_PORT }} |