Merge "Required SQL reporters"

2021-02-05 18:13:30 +00:00
parent 73479829e5 9ab527971f
commit bbe3bb0297
62 changed files with 514 additions and 185 deletions
--- a/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml
@@ -7,15 +7,10 @@
    success:
      gerrit:
        Verified: 1
-      resultsdb_mysql: null
-      resultsdb_postgresql: null
    failure:
      gerrit:
        Verified: -1
-      resultsdb_mysql: null
-      resultsdb_mysql_failures: null
-      resultsdb_postgresql: null
-      resultsdb_postgresql_failures: null
+      resultsdb_failures: null

 - pipeline:
    name: gate
@@ -30,15 +25,10 @@
      gerrit:
        Verified: 2
        submit: true
-      resultsdb_mysql: null
-      resultsdb_postgresql: null
    failure:
      gerrit:
        Verified: -2
-      resultsdb_mysql: null
-      resultsdb_mysql_failures: null
-      resultsdb_postgresql: null
-      resultsdb_postgresql_failures: null
+      resultsdb_failures: null
    start:
      gerrit:
        Verified: 0
@@ -51,14 +41,8 @@
      gerrit:
        - event: ref-updated
          ref: ^refs/tags/.*$
-    success:
-      resultsdb_mysql: null
-      resultsdb_postgresql: null
    failure:
-      resultsdb_mysql: null
-      resultsdb_mysql_failures: null
-      resultsdb_postgresql: null
-      resultsdb_postgresql_failures: null
+      resultsdb_failures: null

 - job:
    name: base
--- a/tests/fixtures/layouts/provides-requires-single-project.yaml
+++ b/tests/fixtures/layouts/provides-requires-single-project.yaml
@@ -7,13 +7,9 @@
    success:
      gerrit:
        Verified: 1
-      resultsdb_mysql: null
-      resultsdb_postgresql: null
    failure:
      gerrit:
        Verified: -1
-      resultsdb_mysql: null
-      resultsdb_postgresql: null

 - job:
    name: base
--- a/tests/fixtures/layouts/provides-requires-two-jobs.yaml
+++ b/tests/fixtures/layouts/provides-requires-two-jobs.yaml
@@ -7,13 +7,9 @@
    success:
      gerrit:
        Verified: 1
-      resultsdb_mysql: null
-      resultsdb_postgresql: null
    failure:
      gerrit:
        Verified: -1
-      resultsdb_mysql: null
-      resultsdb_postgresql: null

 - pipeline:
    name: gate
--- a/tests/fixtures/layouts/provides-requires.yaml
+++ b/tests/fixtures/layouts/provides-requires.yaml
@@ -7,13 +7,9 @@
    success:
      gerrit:
        Verified: 1
-      resultsdb_mysql: null
-      resultsdb_postgresql: null
    failure:
      gerrit:
        Verified: -1
-      resultsdb_mysql: null
-      resultsdb_postgresql: null

 - pipeline:
    name: gate
--- a/tests/fixtures/layouts/sql-build-error.yaml
+++ b/tests/fixtures/layouts/sql-build-error.yaml
@@ -5,11 +5,9 @@
      gerrit:
        - event: patchset-created
    success:
-      resultsdb_mysql: null
      gerrit:
        Verified: 1
    failure:
-      resultsdb_mysql: null
      gerrit:
        Verified: -1

--- a/tests/fixtures/zuul-admin-web-no-override.conf
+++ b/tests/fixtures/zuul-admin-web-no-override.conf
@@ -29,3 +29,7 @@ realm=zuul.example.com
 client_id=zuul.example.com
 issuer_id=zuul_operator
 secret=NoDanaOnlyZuul
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-admin-web-oidc.conf
+++ b/tests/fixtures/zuul-admin-web-oidc.conf
@@ -43,3 +43,7 @@ realm=myOIDC2
 client_id=zuul
 issuer_id=http://oidc2
 scope=openid profile email special-scope
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-admin-web-token-expiry.conf
+++ b/tests/fixtures/zuul-admin-web-token-expiry.conf
@@ -30,3 +30,7 @@ client_id=zuul.example.com
 issuer_id=zuul_operator
 secret=NoDanaOnlyZuul
 max_validity_time=5
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-admin-web.conf
+++ b/tests/fixtures/zuul-admin-web.conf
@@ -29,3 +29,7 @@ realm=zuul.example.com
 client_id=zuul.example.com
 issuer_id=zuul_operator
 secret=NoDanaOnlyZuul
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-connections-cgit.conf
+++ b/tests/fixtures/zuul-connections-cgit.conf
@@ -25,3 +25,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-connections-gerrit-and-github.conf
+++ b/tests/fixtures/zuul-connections-gerrit-and-github.conf
@@ -29,3 +29,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-connections-gitweb.conf
+++ b/tests/fixtures/zuul-connections-gitweb.conf
@@ -24,3 +24,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-connections-merger.conf
+++ b/tests/fixtures/zuul-connections-merger.conf
@@ -21,10 +21,10 @@ server=review.example.com
 user=jenkins
 sshkey=fake_id_rsa1

-[connection resultsdb]
-driver=sql
+[database]
 dburi=$MYSQL_FIXTURE_DBURI$

+
 [connection smtp]
 driver=smtp
 server=localhost
--- a/tests/fixtures/zuul-connections-multiple-gerrits.conf
+++ b/tests/fixtures/zuul-connections-multiple-gerrits.conf
@@ -30,3 +30,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-connections-same-gerrit.conf
+++ b/tests/fixtures/zuul-connections-same-gerrit.conf
@@ -30,3 +30,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-crd-pagure.conf
+++ b/tests/fixtures/zuul-crd-pagure.conf
@@ -37,3 +37,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-default-ansible-version.conf
+++ b/tests/fixtures/zuul-default-ansible-version.conf
@@ -34,3 +34,7 @@ default_to=you@example.com

 [web]
 static_cache_expiry=1200
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-disk-accounting.conf
+++ b/tests/fixtures/zuul-disk-accounting.conf
@@ -25,3 +25,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-elastic-driver.conf
+++ b/tests/fixtures/zuul-elastic-driver.conf
@@ -23,3 +23,6 @@ driver=elasticsearch
 uri=localhost:9200
 use_ssl=true
 verify_certs=false
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
--- a/tests/fixtures/zuul-executor-ansible-callback.conf
+++ b/tests/fixtures/zuul-executor-ansible-callback.conf
@@ -46,3 +46,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-executor-hostname.conf
+++ b/tests/fixtures/zuul-executor-hostname.conf
@@ -30,3 +30,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-gerrit-github.conf
+++ b/tests/fixtures/zuul-gerrit-github.conf
@@ -33,3 +33,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-gerrit-no-stream.conf
+++ b/tests/fixtures/zuul-gerrit-no-stream.conf
@@ -31,3 +31,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-gerrit-web.conf
+++ b/tests/fixtures/zuul-gerrit-web.conf
@@ -33,3 +33,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-git-driver.conf
+++ b/tests/fixtures/zuul-git-driver.conf
@@ -29,3 +29,7 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-github-driver-enterprise.conf
+++ b/tests/fixtures/zuul-github-driver-enterprise.conf
@@ -18,3 +18,7 @@ webhook_token=0000000000000000000000000000000000000000
 app_id=1
 app_key=$APP_KEY_FIXTURE$
 server=github.enterprise.io
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-github-driver.conf
+++ b/tests/fixtures/zuul-github-driver.conf
@@ -26,3 +26,7 @@ sshkey=/home/zuul/.ssh/id_rsa
 driver=github
 sshkey=/home/zuul/.ssh/id_rsa
 server=github.enterprise.io
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-gitlab-driver.conf
+++ b/tests/fixtures/zuul-gitlab-driver.conf
@@ -16,3 +16,7 @@ git_dir=/tmp/zuul-test/executor-git
 driver=gitlab
 server=gitlab
 api_token=0000000000000000000000000000000000000000
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-hold-expiration.conf
+++ b/tests/fixtures/zuul-hold-expiration.conf
@@ -36,3 +36,7 @@ default_to=you@example.com
 [web]
 static_cache_expiry=1200
 root=https://zuul.example.com/
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-mqtt-driver.conf
+++ b/tests/fixtures/zuul-mqtt-driver.conf
@@ -21,5 +21,8 @@ sshkey=fake_id_rsa1
 [connection mqtt]
 driver=mqtt

+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
 [web]
 root=https://tenant.example.com/
--- a/tests/fixtures/zuul-pagure-driver-whitelist.conf
+++ b/tests/fixtures/zuul-pagure-driver-whitelist.conf
@@ -17,3 +17,7 @@ driver=pagure
 server=pagure
 api_token=0000000000000000000000000000000000000000
 source_whitelist=::ffff:127.0.0.1
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-pagure-driver.conf
+++ b/tests/fixtures/zuul-pagure-driver.conf
@@ -16,3 +16,7 @@ git_dir=/tmp/zuul-test/executor-git
 driver=pagure
 server=pagure
 api_token=0000000000000000000000000000000000000000
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-push-reqs.conf
+++ b/tests/fixtures/zuul-push-reqs.conf
@@ -20,3 +20,7 @@ webhook_token=00000000000000000000000000000000000000000
 driver=gerrit
 server=review.example.com
 user=jenkins
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
--- a/tests/fixtures/zuul-sql-driver-bad.conf
+++ b/tests/fixtures/zuul-sql-driver-bad.conf
@@ -18,8 +18,7 @@ server=review.example.com
 user=jenkins
 sshkey=fake_id_rsa1

-[connection resultsdb_mysql]
-driver=sql
+[database]
 dburi=mysql+pymysql://bad:creds@host/db

 [connection resultsdb_mysql_failures]
--- a/tests/fixtures/zuul-sql-driver-mysql.conf
+++ b/tests/fixtures/zuul-sql-driver-mysql.conf
@@ -0,0 +1,26 @@
+[gearman]
+server=127.0.0.1
+
+[scheduler]
+tenant_config=main.yaml
+
+[merger]
+git_dir=/tmp/zuul-test/merger-git
+git_user_email=zuul@example.com
+git_user_name=zuul
+
+[executor]
+git_dir=/tmp/zuul-test/executor-git
+
+[connection gerrit]
+driver=gerrit
+server=review.example.com
+user=jenkins
+sshkey=fake_id_rsa1
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
+[connection resultsdb_failures]
+driver=sql
+dburi=$MYSQL_FIXTURE_DBURI$
--- a/tests/fixtures/zuul-sql-driver-postgres.conf
+++ b/tests/fixtures/zuul-sql-driver-postgres.conf
@@ -0,0 +1,26 @@
+[gearman]
+server=127.0.0.1
+
+[scheduler]
+tenant_config=main.yaml
+
+[merger]
+git_dir=/tmp/zuul-test/merger-git
+git_user_email=zuul@example.com
+git_user_name=zuul
+
+[executor]
+git_dir=/tmp/zuul-test/executor-git
+
+[connection gerrit]
+driver=gerrit
+server=review.example.com
+user=jenkins
+sshkey=fake_id_rsa1
+
+[database]
+dburi=$POSTGRESQL_FIXTURE_DBURI$
+
+[connection resultsdb_failures]
+driver=sql
+dburi=$POSTGRESQL_FIXTURE_DBURI$
--- a/tests/fixtures/zuul-sql-driver-prefix-mysql.conf
+++ b/tests/fixtures/zuul-sql-driver-prefix-mysql.conf
@@ -18,20 +18,10 @@ server=review.example.com
 user=jenkins
 sshkey=fake_id_rsa1

-[connection resultsdb_mysql]
-driver=sql
+[database]
 dburi=$MYSQL_FIXTURE_DBURI$
 table_prefix=prefix_

-[connection resultsdb_mysql_failures]
+[connection resultsdb_failures]
 driver=sql
 dburi=$MYSQL_FIXTURE_DBURI$
-
-[connection resultsdb_postgresql]
-driver=sql
-dburi=$POSTGRESQL_FIXTURE_DBURI$
-table_prefix=prefix_
-
-[connection resultsdb_postgresql_failures]
-driver=sql
-dburi=$POSTGRESQL_FIXTURE_DBURI$
--- a/tests/fixtures/zuul-sql-driver-prefix-postgres.conf
+++ b/tests/fixtures/zuul-sql-driver-prefix-postgres.conf
@@ -18,18 +18,11 @@ server=review.example.com
 user=jenkins
 sshkey=fake_id_rsa1

-[connection resultsdb_mysql]
-driver=sql
-dburi=$MYSQL_FIXTURE_DBURI$
-
-[connection resultsdb_mysql_failures]
-driver=sql
-dburi=$MYSQL_FIXTURE_DBURI$
-
-[connection resultsdb_postgresql]
+[database]
 driver=sql
 dburi=$POSTGRESQL_FIXTURE_DBURI$
+table_prefix=prefix_

-[connection resultsdb_postgresql_failures]
+[connection resultsdb_failures]
 driver=sql
 dburi=$POSTGRESQL_FIXTURE_DBURI$
--- a/tests/fixtures/zuul-winrm.conf
+++ b/tests/fixtures/zuul-winrm.conf
@@ -35,3 +35,6 @@ server=localhost
 port=25
 default_from=zuul@example.com
 default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
--- a/tests/fixtures/zuul.conf
+++ b/tests/fixtures/zuul.conf
@@ -31,6 +31,9 @@ port=25
 default_from=zuul@example.com
 default_to=you@example.com

+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
+
 [web]
 static_cache_expiry=1200
 root=https://zuul.example.com/