diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-08-16 08:57:15 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-08-17 10:39:09 +0300 |
| commit | 5a18fd457658423ddee36f5c3a56d458ddf0c261 (patch) | |
| tree | f8b253416bed13b7eef94855caf6b34aa1e6cf9d /.gitlab-ci.yml | |
| parent | 5745aa91bc4061bef8f2c2475f974327bf6643d7 (diff) | |
ci: Split up Postgres and PgBouncer templates
Split up Postgres and PgBouncer templates such that we can reuse the
Postgres template for our jobs without having to include PgBouncer.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 209e3977c..32695d714 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,14 +84,23 @@ danger-review: expire_in: 1 week .postgres_template: &postgres_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31-pgbouncer-1.14 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31 services: - postgres:${POSTGRES_VERSION} - variables: + variables: &postgres_variables PGHOST: postgres PGPORT: "5432" PGUSER: postgres POSTGRES_HOST_AUTH_METHOD: trust + before_script: + - go version + - git version + +.pgbouncer_template: &pgbouncer_definition + <<: *postgres_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31-pgbouncer-1.14 + variables: + <<: *postgres_variables PGHOST_PGBOUNCER: 0.0.0.0 PGPORT_PGBOUNCER: "6432" before_script: @@ -272,10 +281,10 @@ praefect_sql_connect: - ./_build/bin/praefect -config config.praefect.toml sql-ping - ./_build/bin/praefect -config config.praefect.toml sql-migrate -praefect_sql_test: +pgbouncer_test: # This job verifies all operations run without issues if PgBouncer is set in between service and PostgreSQL database. <<: *test_definition - <<: *postgres_definition + <<: *pgbouncer_definition script: - make test-postgres |