diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-14 09:18:08 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-20 11:03:21 +0300 |
| commit | f89ffa3dcc4dcbcc2f2b56a9287448f4a90e76a5 (patch) | |
| tree | 5c5fe727874f9531dd505ef79e6cdbd91ae5b4e8 | |
| parent | abc110b78e81dee9cb79f5fbf1be6d98e0fb57ec (diff) | |
ci: Stop waiting for Postgres manually
GitLab CI will automatically wait for exposed ports of services to
become reachable, so it shouldn't be necessary to manually check whether
Postgres or PgBouncer services are up and running. Furthermore, this
check is problematic in the context of FIPS tests, where we don't have
the `psql` client available in our images.
Remove the check and let GitLab CI handle this for us.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d969f49a7..5e4e34664 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,7 +95,6 @@ include: TEST_FULL_OUTPUT: /tmp/test-output.log before_script: &test_before_script - go version - - while ! psql -h $PGHOST -U $PGUSER -c 'SELECT 1' > /dev/null; do echo "awaiting Postgres service to be ready..." && sleep 1 ; done && echo "Postgres service is ready!" # Create a directory for the unprivileged user that we're running tests as. # This is required so that we can still store test reports successfully. - install --directory --owner=${TEST_UID} --group=${TEST_UID} _unprivileged @@ -238,7 +237,6 @@ test:pgbouncer: FF_NETWORK_PER_BUILD: "true" before_script: - *test_before_script - - while ! psql -h "${PGHOST_PGBOUNCER}" -p "${PGPORT_PGBOUNCER}" -U "${PGUSER}" -c 'SELECT 1' > /dev/null; do echo "awaiting PgBouncer service to be ready..." && sleep 1 ; done && echo "PgBouncer service is ready!" script: # We need to explicitly build all prerequisites so that we can run tests unprivileged. - make -j$(nproc) build prepare-tests @@ -297,8 +295,6 @@ dbschema: - postgres:11.13-alpine variables: <<: *postgres_variables - before_script: - - while ! psql -h $PGHOST -U $PGUSER -c 'SELECT 1' > /dev/null; do echo "awaiting Postgres service to be ready..." && sleep 1 ; done && echo "Postgres service is ready!" script: - make dump-database-schema no-changes artifacts: |