From 4a3956b9b2866efd5adf911651a917550fb983a7 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 17 Sep 2019 14:21:16 -0700 Subject: [PATCH] Use the gerrit driver for the googlesource connection This is the connection for Gerrit's Gerrit. We can connect to it directly with the Gerrit driver now that we support entirely HTTP-based Gerrits and we have an account. Use that so we can set up some third-party CI testing. Change-Id: I7b91b4e67594ce62772e3e450a1236095d4ef1c9 --- hiera/group/zuul-executor.yaml | 8 ++++++-- hiera/group/zuul-merger.yaml | 8 ++++++-- hiera/group/zuul-scheduler.yaml | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/hiera/group/zuul-executor.yaml b/hiera/group/zuul-executor.yaml index 63e1e1c73d..7745e9c536 100644 --- a/hiera/group/zuul-executor.yaml +++ b/hiera/group/zuul-executor.yaml @@ -11,5 +11,9 @@ zuul_connections: driver: 'github' - name: 'googlesource' - driver: 'git' - baseurl: https://gerrit.googlesource.com + driver: 'gerrit' + server: 'gerrit-review.googlesource.com' + canonical_hostname: 'gerrit.googlesource.com' + user: 'git-infra-root.openstack.org' + stream_events: 'false' + auth_type: 'basic' diff --git a/hiera/group/zuul-merger.yaml b/hiera/group/zuul-merger.yaml index 4e41185083..bc37db65f6 100644 --- a/hiera/group/zuul-merger.yaml +++ b/hiera/group/zuul-merger.yaml @@ -41,5 +41,9 @@ zuul_connections: driver: 'github' - name: 'googlesource' - driver: 'git' - baseurl: https://gerrit.googlesource.com + driver: 'gerrit' + server: 'gerrit-review.googlesource.com' + canonical_hostname: 'gerrit.googlesource.com' + user: 'git-infra-root.openstack.org' + stream_events: 'false' + auth_type: 'basic' diff --git a/hiera/group/zuul-scheduler.yaml b/hiera/group/zuul-scheduler.yaml index 67b664ef0e..effe5fe813 100644 --- a/hiera/group/zuul-scheduler.yaml +++ b/hiera/group/zuul-scheduler.yaml @@ -31,8 +31,12 @@ zuul_connections: rate_limit_logging: 'false' - name: 'googlesource' - driver: 'git' - baseurl: https://gerrit.googlesource.com + driver: 'gerrit' + server: 'gerrit-review.googlesource.com' + canonical_hostname: 'gerrit.googlesource.com' + user: 'git-infra-root.openstack.org' + stream_events: 'false' + auth_type: 'basic' gearman_server_ssl_cert: | -----BEGIN CERTIFICATE-----