Build/CI: Make integration-tests depend on initialize (#40782)

* Make integration tests depend on initialize * Reorder steps for better visualisation
2026-09-05 04:40:13 -05:00 · 2021-10-21 22:28:57 +02:00
parent 8b6a07a313
commit 624d7631e6
6 changed files with 250 additions and 290 deletions
@@ -96,6 +96,36 @@ steps:
    TEST_MAX_WORKERS: 50%
  image: grafana/build-container:1.4.3
  name: test-frontend
+- commands:
+  - apt-get update
+  - apt-get install -yq postgresql-client
+  - dockerize -wait tcp://postgres:5432 -timeout 120s
+  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database postgres
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: postgres
+    PGPASSWORD: grafanatest
+    POSTGRES_HOST: postgres
+  image: grafana/build-container:1.4.3
+  name: postgres-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database mysql
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql
+  image: grafana/build-container:1.4.3
+  name: mysql-integration-tests
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
    --variants linux-x64,linux-x64-musl,osx64,win64,armv6 --no-pull-enterprise
@@ -225,38 +255,6 @@ steps:
    dry_run: true
    edition: oss
    ubuntu: false
- commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.3
-  name: postgres-integration-tests
- commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
-    -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.3
-  name: mysql-integration-tests
 trigger:
  event:
  - pull_request
@@ -370,6 +368,36 @@ steps:
    TEST_MAX_WORKERS: 50%
  image: grafana/build-container:1.4.3
  name: test-frontend
+- commands:
+  - apt-get update
+  - apt-get install -yq postgresql-client
+  - dockerize -wait tcp://postgres:5432 -timeout 120s
+  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database postgres
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: postgres
+    PGPASSWORD: grafanatest
+    POSTGRES_HOST: postgres
+  image: grafana/build-container:1.4.3
+  name: postgres-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database mysql
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql
+  image: grafana/build-container:1.4.3
+  name: mysql-integration-tests
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
    --no-pull-enterprise
@@ -540,38 +568,6 @@ steps:
    ubuntu: true
    username:
      from_secret: docker_user
- commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.3
-  name: postgres-integration-tests
- commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
-    -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.3
-  name: mysql-integration-tests
 - commands:
  - ./scripts/circle-release-canary-packages.sh
  depends_on:
@@ -585,8 +581,6 @@ steps:
  - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
  depends_on:
  - end-to-end-tests
-  - mysql-integration-tests
-  - postgres-integration-tests
  environment:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
@@ -827,6 +821,36 @@ steps:
    TEST_MAX_WORKERS: 50%
  image: grafana/build-container:1.4.3
  name: test-frontend
+- commands:
+  - apt-get update
+  - apt-get install -yq postgresql-client
+  - dockerize -wait tcp://postgres:5432 -timeout 120s
+  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database postgres
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: postgres
+    PGPASSWORD: grafanatest
+    POSTGRES_HOST: postgres
+  image: grafana/build-container:1.4.3
+  name: postgres-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database mysql
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql
+  image: grafana/build-container:1.4.3
+  name: mysql-integration-tests
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN}
    --no-pull-enterprise ${DRONE_TAG}
@@ -949,38 +973,6 @@ steps:
    ubuntu: true
    username:
      from_secret: docker_user
- commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.3
-  name: postgres-integration-tests
- commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
-    -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.3
-  name: mysql-integration-tests
 - commands:
  - yarn storybook:build
  - ./bin/grabpl verify-storybook
@@ -1003,8 +995,6 @@ steps:
  - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
  depends_on:
  - end-to-end-tests
-  - mysql-integration-tests
-  - postgres-integration-tests
  environment:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
@@ -1209,6 +1199,36 @@ steps:
    TEST_MAX_WORKERS: 50%
  image: grafana/build-container:1.4.3
  name: test-frontend
+- commands:
+  - apt-get update
+  - apt-get install -yq postgresql-client
+  - dockerize -wait tcp://postgres:5432 -timeout 120s
+  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database postgres
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: postgres
+    PGPASSWORD: grafanatest
+    POSTGRES_HOST: postgres
+  image: grafana/build-container:1.4.3
+  name: postgres-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database mysql
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql
+  image: grafana/build-container:1.4.3
+  name: mysql-integration-tests
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN}
    --no-pull-enterprise ${DRONE_TAG}
@@ -1367,38 +1387,6 @@ steps:
    ubuntu: true
    username:
      from_secret: docker_user
- commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.3
-  name: postgres-integration-tests
- commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
-    -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.3
-  name: mysql-integration-tests
 - commands:
  - dockerize -wait tcp://redis:6379/0 -timeout 120s
  - ./bin/grabpl integration-tests
@@ -1432,8 +1420,6 @@ steps:
  - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads
  depends_on:
  - end-to-end-tests
-  - mysql-integration-tests
-  - postgres-integration-tests
  - redis-integration-tests
  - memcached-integration-tests
  environment:
@@ -1496,8 +1482,6 @@ steps:
  - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2
  depends_on:
  - end-to-end-tests-enterprise2
-  - mysql-integration-tests
-  - postgres-integration-tests
  - redis-integration-tests
  - memcached-integration-tests
  environment:
@@ -1771,6 +1755,36 @@ steps:
    TEST_MAX_WORKERS: 50%
  image: grafana/build-container:1.4.3
  name: test-frontend
+- commands:
+  - apt-get update
+  - apt-get install -yq postgresql-client
+  - dockerize -wait tcp://postgres:5432 -timeout 120s
+  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database postgres
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: postgres
+    PGPASSWORD: grafanatest
+    POSTGRES_HOST: postgres
+  image: grafana/build-container:1.4.3
+  name: postgres-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database mysql
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql
+  image: grafana/build-container:1.4.3
+  name: mysql-integration-tests
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN}
    --no-pull-enterprise v7.3.0-test
@@ -1885,38 +1899,6 @@ steps:
    dry_run: true
    edition: oss
    ubuntu: true
- commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.3
-  name: postgres-integration-tests
- commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
-    -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.3
-  name: mysql-integration-tests
 - commands:
  - yarn storybook:build
  - ./bin/grabpl verify-storybook
@@ -1939,8 +1921,6 @@ steps:
  - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads-test
  depends_on:
  - end-to-end-tests
-  - mysql-integration-tests
-  - postgres-integration-tests
  environment:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
@@ -2142,6 +2122,36 @@ steps:
    TEST_MAX_WORKERS: 50%
  image: grafana/build-container:1.4.3
  name: test-frontend
+- commands:
+  - apt-get update
+  - apt-get install -yq postgresql-client
+  - dockerize -wait tcp://postgres:5432 -timeout 120s
+  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database postgres
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: postgres
+    PGPASSWORD: grafanatest
+    POSTGRES_HOST: postgres
+  image: grafana/build-container:1.4.3
+  name: postgres-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database mysql
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql
+  image: grafana/build-container:1.4.3
+  name: mysql-integration-tests
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN}
    --no-pull-enterprise v7.3.0-test
@@ -2292,38 +2302,6 @@ steps:
    dry_run: true
    edition: enterprise
    ubuntu: true
- commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.3
-  name: postgres-integration-tests
- commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
-    -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.3
-  name: mysql-integration-tests
 - commands:
  - dockerize -wait tcp://redis:6379/0 -timeout 120s
  - ./bin/grabpl integration-tests
@@ -2357,8 +2335,6 @@ steps:
  - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads-test
  depends_on:
  - end-to-end-tests
-  - mysql-integration-tests
-  - postgres-integration-tests
  - redis-integration-tests
  - memcached-integration-tests
  environment:
@@ -2421,8 +2397,6 @@ steps:
  - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-test
  depends_on:
  - end-to-end-tests-enterprise2
-  - mysql-integration-tests
-  - postgres-integration-tests
  - redis-integration-tests
  - memcached-integration-tests
  environment:
@@ -2701,6 +2675,36 @@ steps:
    TEST_MAX_WORKERS: 50%
  image: grafana/build-container:1.4.3
  name: test-frontend
+- commands:
+  - apt-get update
+  - apt-get install -yq postgresql-client
+  - dockerize -wait tcp://postgres:5432 -timeout 120s
+  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database postgres
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: postgres
+    PGPASSWORD: grafanatest
+    POSTGRES_HOST: postgres
+  image: grafana/build-container:1.4.3
+  name: postgres-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database mysql
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql
+  image: grafana/build-container:1.4.3
+  name: mysql-integration-tests
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
    --no-pull-enterprise
@@ -2813,38 +2817,6 @@ steps:
    dry_run: true
    edition: oss
    ubuntu: true
- commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.3
-  name: postgres-integration-tests
- commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
-    -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.3
-  name: mysql-integration-tests
 - commands:
  - yarn storybook:build
  - ./bin/grabpl verify-storybook
@@ -2867,8 +2839,6 @@ steps:
  - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
  depends_on:
  - end-to-end-tests
-  - mysql-integration-tests
-  - postgres-integration-tests
  environment:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
@@ -3044,6 +3014,36 @@ steps:
    TEST_MAX_WORKERS: 50%
  image: grafana/build-container:1.4.3
  name: test-frontend
+- commands:
+  - apt-get update
+  - apt-get install -yq postgresql-client
+  - dockerize -wait tcp://postgres:5432 -timeout 120s
+  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database postgres
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: postgres
+    PGPASSWORD: grafanatest
+    POSTGRES_HOST: postgres
+  image: grafana/build-container:1.4.3
+  name: postgres-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - ./bin/grabpl integration-tests --database mysql
+  depends_on:
+  - initialize
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql
+  image: grafana/build-container:1.4.3
+  name: mysql-integration-tests
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
    --no-pull-enterprise
@@ -3190,38 +3190,6 @@ steps:
    dry_run: true
    edition: enterprise
    ubuntu: true
- commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.3
-  name: postgres-integration-tests
- commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
-    -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.3
-  name: mysql-integration-tests
 - commands:
  - yarn storybook:build
  - ./bin/grabpl verify-storybook
@@ -3264,8 +3232,6 @@ steps:
  - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads
  depends_on:
  - end-to-end-tests
-  - mysql-integration-tests
-  - postgres-integration-tests
  - redis-integration-tests
  - memcached-integration-tests
  environment:
@@ -3328,8 +3294,6 @@ steps:
  - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2
  depends_on:
  - end-to-end-tests-enterprise2
-  - mysql-integration-tests
-  - postgres-integration-tests
  - redis-integration-tests
  - memcached-integration-tests
  environment:
@@ -3485,6 +3449,6 @@ kind: secret
 name: drone_token
 ---
 kind: signature
-hmac: 0d26eda19dc6e530d02c734704c8a9d01beb5082c7e14b2609577b8695ed06f5
+hmac: 103fe906b04e8a336e3113007921d62a57107bc7a86a14442b438fa54406c084

 ...
@@ -153,7 +153,7 @@ clean: ## Clean up intermediate build artifacts.
 # This repository's configuration is protected (https://readme.drone.io/signature/).
 # Use this make target to regenerate the configuration YAML files when
 # you modify starlark files.
-drone:
+drone: $(DRONE)
 	@if [ "$(DRONE_VERSION)" != "1.4.0" ]; then\
 		echo "WARN: You are using drone-cli ${DRONE_VERSION}. Please update your LOCAL version to 1.4.0. Using latest bingo version...";\
 	fi
@@ -61,6 +61,8 @@ def get_steps(edition, is_downstream=False):
        test_backend_step(edition=edition),
        test_backend_integration_step(edition=edition),
        test_frontend_step(),
+        postgres_integration_tests_step(),
+        mysql_integration_tests_step(),
        build_backend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
        build_frontend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
        build_plugins_step(edition=edition, sign=True),
@@ -90,8 +92,6 @@ def get_steps(edition, is_downstream=False):
        copy_packages_for_docker_step(),
        build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=publish),
        build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=publish),
-        postgres_integration_tests_step(),
-        mysql_integration_tests_step(),
    ])

    if include_enterprise2:
@@ -53,6 +53,8 @@ def pr_pipelines(edition):
        test_backend_step(edition=edition),
        test_backend_integration_step(edition=edition),
        test_frontend_step(),
+        postgres_integration_tests_step(),
+        mysql_integration_tests_step(),
        build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants),
        build_frontend_step(edition=edition, ver_mode=ver_mode),
        build_plugins_step(edition=edition),
@@ -82,8 +84,6 @@ def pr_pipelines(edition):
        build_docs_website_step(),
        copy_packages_for_docker_step(),
        build_docker_images_step(edition=edition, ver_mode=ver_mode, archs=['amd64',]),
-        postgres_integration_tests_step(),
-        mysql_integration_tests_step(),
    ])

    if include_enterprise2:
@@ -89,6 +89,8 @@ def get_steps(edition, ver_mode):
        test_backend_step(edition=edition),
        test_backend_integration_step(edition=edition),
        test_frontend_step(),
+        postgres_integration_tests_step(),
+        mysql_integration_tests_step(),
        build_backend_step(edition=edition, ver_mode=ver_mode),
        build_frontend_step(edition=edition, ver_mode=ver_mode),
        build_plugins_step(edition=edition, sign=True),
@@ -113,8 +115,6 @@ def get_steps(edition, ver_mode):
        copy_packages_for_docker_step(),
        build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish),
        build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=should_publish),
-        postgres_integration_tests_step(),
-        mysql_integration_tests_step(),
    ])

    build_storybook = build_storybook_step(edition=edition, ver_mode=ver_mode)
@@ -681,8 +681,7 @@ def postgres_integration_tests_step():
        'name': 'postgres-integration-tests',
        'image': build_image,
        'depends_on': [
-            'test-backend',
-            'test-frontend',
+            'initialize',
        ],
        'environment': {
            'PGPASSWORD': 'grafanatest',
@@ -706,8 +705,7 @@ def mysql_integration_tests_step():
        'name': 'mysql-integration-tests',
        'image': build_image,
        'depends_on': [
-            'test-backend',
-            'test-frontend',
+            'initialize',
        ],
        'environment': {
            'GRAFANA_TEST_DB': 'mysql',
@@ -795,8 +793,6 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):

    dependencies = [
        'end-to-end-tests' + enterprise2_suffix(edition),
-        'mysql-integration-tests',
-        'postgres-integration-tests',
    ]

    if edition in ('enterprise', 'enterprise2'):