Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/use-bitnami-postgres-for-test-template.yml

@@ -1,5 +0,0 @@
----
-title: 'Switch Auto Test CI template to `bitnami/postgresql` docker image (was previously `postgres`)'
-merge_request: 44329
-author:
-type: changed

lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml

@@ -1,10 +1,9 @@
 test:
   variables:
-    POSTGRES_VERSION: 9.6.16 # This is the version used by Auto Deploy by default, see https://hub.docker.com/r/bitnami/postgresql/tags for available tags
+    POSTGRES_VERSION: 9.6.16
     POSTGRES_DB: test
   services:
-    - name: "bitnami/postgresql:${POSTGRES_VERSION}"
-      alias: postgres
+    - "postgres:${POSTGRES_VERSION}"
   stage: test
   image: gliderlabs/herokuish:latest
   needs: []