7 files changed, 161 insertions, 15 deletions
diff --git a/mason/share/lighttpd.conf b/mason/share/lighttpd.conf
new file mode 100644
index 00000000..2e9f6350
--- /dev/null
+++ b/mason/share/lighttpd.conf
@@ -0,0 +1,21 @@
+server.document-root = "/var/www/" 
+
+server.port = 80
+
+server.username = "www" 
+server.groupname = "www" 
+
+mimetype.assign = (
+    ".html" => "text/html", 
+    ".txt" => "text/plain",
+    ".log" => "text/plain",
+    ".jpg" => "image/jpeg",
+    ".png" => "image/png" 
+)
+
+static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" )
+index-file.names = ( "index.html" )
+
+$HTTP["url"] =~ "^/logs/" {
+    dir-listing.activate = "enable"
+}
diff --git a/mason/share/mason.conf b/mason/share/mason.conf
deleted file mode 100644
index 1295ce84..00000000
--- a/mason/share/mason.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is generarated by the mason-setup systemd unit.
-# If you want to change the configuration, change the configuration
-# in /etc/mason/mason.conf and restart the service.
-
-ARTIFACT_CACHE_SERVER={{ ARTIFACT_CACHE_SERVER|quote }}
-UPSTREAM_TROVE_ADDRESS={{ TROVE_HOST|quote }}
-DEFINITIONS_REF={{ MASON_DEFINITIONS_REF|quote }}
-DISTBUILD_ARCH={{ MASON_DISTBUILD_ARCH|quote }}
-DISTBUILD_CONTROLLER_ADDRESS={{ CONTROLLERHOST|quote }}
-TROVE_ID={{ TROVE_ID|quote }}
-BUILD_CLUSTER_MORPHOLOGY={{ MASON_CLUSTER_MORPHOLOGY|quote }}
-MASON_TEST_HOST={{ MASON_TEST_HOST|quote }}
-TEST_INFRASTRUCTURE_TYPE={{ TEST_INFRASTRUCTURE_TYPE|quote }}
-{% if OPENSTACK_NETWORK_ID is defined %}OPENSTACK_NETWORK_ID={{ OPENSTACK_NETWORK_ID|quote }}{% endif %}
diff --git a/mason/share/os.conf b/mason/share/os.conf
index 21ef398c..1acfff79 100644
--- a/mason/share/os.conf
+++ b/mason/share/os.conf
@@ -18,7 +18,6 @@ export OS_AUTH_URL={{ OS_AUTH_URL|quote }}
 
 # With the addition of Keystone we have standardized on the term **tenant**
 # as the entity that owns the resources.
-export OS_TENANT_ID={{ OS_TENANT_ID|quote }}
 export OS_TENANT_NAME={{ OS_TENANT_NAME|quote }}
 
 # In addition to the owning entity (tenant), openstack stores the entity
diff --git a/mason/share/turbo-hipster-config.yaml b/mason/share/turbo-hipster-config.yaml
new file mode 100644
index 00000000..5402e365
--- /dev/null
+++ b/mason/share/turbo-hipster-config.yaml
@@ -0,0 +1,47 @@
+zuul_server:
+  gerrit_site: "http://{{ GERRIT_HOSTNAME }}:{{ GERRIT_HTTP_PORT }}"
+  git_origin: "git://{{ GERRIT_HOSTNAME }}:{{ GERRIT_GIT_PORT }}"
+  gearman_host: "{{ GEARMAN_HOST }}"
+  gearman_port: "{{ GEARMAN_PORT }}"
+
+debug_log: /var/log/turbo-hipster/debug.log
+jobs_working_dir: /var/lib/turbo-hipster/jobs
+git_working_dir: /var/lib/turbo-hipster/git
+pip_download_cache: /var/cache/pip
+
+plugins:
+  - name: build
+    function: build:build
+    import-path: mason.tests.build
+    location: /usr/share/system-tests/
+    config:
+      trove-host: "{{ TROVE_HOST }}"
+      artifact-cache-server: "{{ ARTIFACT_CACHE_SERVER }}"
+      controllers: [ "{{ MASON_DISTBUILD_CONTROLLERS }}" ]
+      cluster-morphology: "{{ MASON_CLUSTER_MORPHOLOGY }}"
+  - name: build-test
+    function: build:build_test
+    import-path: mason.tests.build_test
+    location: /usr/share/system-tests/
+    config:
+      trove-host: "{{ TROVE_HOST }}"
+      cluster-morphology: "{{ MASON_CLUSTER_MORPHOLOGY }}"
+      test-infrastructure-type: "{{ MASON_TEST_INFRASTRUCTURE_TYPE }}"
+      deployment-host: [ "{{ MASON_TEST_HOSTS }}" ]
+      trove-id: "{{ TROVE_ID }}"
+      openstack-network-id: "{{ OPENSTACK_NETWORK_ID }}"
+  - name: artifact-upload
+    function: build:artifact-upload
+    import-path: mason.tests.artifact_upload
+    location: /usr/share/system-tests/
+    config:
+      artifact-cache-server: "{{ ARTIFACT_CACHE_SERVER }}"
+      cluster-morphology: "{{ MASON_CLUSTER_MORPHOLOGY }}"
+      architecture: "{{ MASON_ARCHITECTURE }}"
+      upstream-trove: "{{ MASON_UPSTREAM_TROVE }}"
+      upload-release-artifacts: False
+
+publish_logs:
+  type: local
+  path: /var/log/
+  prepend_url: http://localhost/logs
diff --git a/mason/share/zuul-layout.yaml b/mason/share/zuul-layout.yaml
new file mode 100644
index 00000000..689c8219
--- /dev/null
+++ b/mason/share/zuul-layout.yaml
@@ -0,0 +1,23 @@
+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: definitions
+    check:
+      - build:
+        - build_test:
+          - artifact_upload
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.conf b/mason/share/zuul.conf
new file mode 100644
index 00000000..21066e70
--- /dev/null
+++ b/mason/share/zuul.conf
@@ -0,0 +1,26 @@
+[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 }}