From 4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Wed, 20 May 2015 09:44:05 +0000 Subject: Install configuration files in the correct place Also, have a more sensible default layout.yaml. --- mason/share/zuul-layout.yaml | 22 ---------------------- mason/share/zuul-logging.conf | 44 ------------------------------------------- mason/share/zuul.conf | 26 ------------------------- mason/share/zuul/layout.yaml | 31 ++++++++++++++++++++++++++++++ mason/share/zuul/logging.conf | 44 +++++++++++++++++++++++++++++++++++++++++++ mason/share/zuul/zuul.conf | 27 ++++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 92 deletions(-) delete mode 100644 mason/share/zuul-layout.yaml delete mode 100644 mason/share/zuul-logging.conf delete mode 100644 mason/share/zuul.conf create mode 100644 mason/share/zuul/layout.yaml create mode 100644 mason/share/zuul/logging.conf create mode 100644 mason/share/zuul/zuul.conf (limited to 'mason/share') diff --git a/mason/share/zuul-layout.yaml b/mason/share/zuul-layout.yaml deleted file mode 100644 index a845a62f..00000000 --- a/mason/share/zuul-layout.yaml +++ /dev/null @@ -1,22 +0,0 @@ -pipelines: - - name: check - manager: IndependentPipelineManager - trigger: - gerrit: - - event: patchset-created - success: - gerrit: - verified: 1 - failure: - gerrit: - verified: -1 - -jobs: - - name: ^.*-merge$ - failure-message: Unable to merge change, please rebase and try again. - -projects: - - name: baserock/baserock/definitions - check: - - build: - - build_test diff --git a/mason/share/zuul-logging.conf b/mason/share/zuul-logging.conf deleted file mode 100644 index 8b76da26..00000000 --- a/mason/share/zuul-logging.conf +++ /dev/null @@ -1,44 +0,0 @@ -[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.conf b/mason/share/zuul.conf deleted file mode 100644 index 21066e70..00000000 --- a/mason/share/zuul.conf +++ /dev/null @@ -1,26 +0,0 @@ -[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] -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 }} 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 }} -- cgit v1.2.1