diff options
-rw-r--r-- | mason.configure | 2 | ||||
-rw-r--r-- | mason/ansible/mason-setup.yml | 17 | ||||
-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 | ||||
-rw-r--r-- | mason/zuul-merger.service | 2 | ||||
-rw-r--r-- | mason/zuul-server.service | 2 |
7 files changed, 28 insertions, 11 deletions
diff --git a/mason.configure b/mason.configure index e0be6b2e..38792e48 100644 --- a/mason.configure +++ b/mason.configure @@ -47,7 +47,7 @@ mkdir -p "$ROOT"/var/log/zuul mkdir -p "$ROOT/usr/share/mason-setup" mkdir -p "$ROOT/usr/lib/mason-setup" -cp mason/share/* "$ROOT/usr/share/mason-setup" +cp -r mason/share/* "$ROOT/usr/share/mason-setup" cp -r mason/ansible "$ROOT/usr/lib/mason-setup/" ln -s ../mason-setup.service "$ROOT"/etc/systemd/system/multi-user.target.wants/mason-setup.service diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml index 66d38d81..d47439b5 100644 --- a/mason/ansible/mason-setup.yml +++ b/mason/ansible/mason-setup.yml @@ -70,14 +70,21 @@ - fail: msg='OS_AUTH_URL is mandatory when MASON_TEST_INFRASTRUCTURE_TYPE=openstack' when: MASON_TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_AUTH_URL is not defined - - name: Create required configuration files - template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} + - name: Create Zuul configuration directory + file: path=/etc/zuul state=directory + + - name: Create Zuul configuration files + template: src=/usr/share/mason-setup/zuul/{{ item }} dest=/etc/zuul/{{ item }} with_items: - zuul.conf - - turbo-hipster-config.yaml + - layout.yaml + - logging.conf + + - name: Create other required configuration files + template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} + with_items: - lighttpd.conf - - zuul-layout.yaml - - zuul-logging.conf + - turbo-hipster-config.yaml - name: Create the OpenStack credentials file template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} 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 diff --git a/mason/zuul-merger.service b/mason/zuul-merger.service index a3aa0ca5..c975a0de 100644 --- a/mason/zuul-merger.service +++ b/mason/zuul-merger.service @@ -4,7 +4,7 @@ After=zuul-server.service [Service] User=root -ExecStart=/usr/bin/zuul-merger -d -c /etc/zuul.conf +ExecStart=/usr/bin/zuul-merger -d [Install] WantedBy=multi-user.target diff --git a/mason/zuul-server.service b/mason/zuul-server.service index dfc6436f..a71e28d6 100644 --- a/mason/zuul-server.service +++ b/mason/zuul-server.service @@ -4,7 +4,7 @@ After=mason-setup.service [Service] User=root -ExecStart=/usr/bin/zuul-server -d -c /etc/zuul.conf -l /etc/zuul-layout.yaml +ExecStart=/usr/bin/zuul-server -d [Install] WantedBy=multi-user.target |