From d0621b605422a44386041d3cd7d98aa04a7cac9d Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Wed, 19 Aug 2020 17:20:15 +0200
Subject: [PATCH] Drone: Fix order of steps (#27076)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
---
 .drone.yml       | 68 ++++++++++++++++++++++++------------------------
 scripts/lib.star |  8 +++---
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8ab8de38cb5..32dcebab262 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -62,23 +62,6 @@ steps:
   depends_on:
   - initialize
 
-- name: build-backend
-  image: grafana/build-container:1.2.24
-  commands:
-  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id $DRONE_BUILD_NUMBER --variants linux-x64,linux-x64-musl,osx64,win64 --no-pull-enterprise
-  depends_on:
-  - initialize
-  - lint-backend
-  - test-backend
-
-- name: build-frontend
-  image: grafana/build-container:1.2.24
-  commands:
-  - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise
-  depends_on:
-  - initialize
-  - test-frontend
-
 - name: test-backend
   image: grafana/build-container:1.2.24
   commands:
@@ -100,6 +83,23 @@ steps:
   depends_on:
   - initialize
 
+- name: build-backend
+  image: grafana/build-container:1.2.24
+  commands:
+  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id $DRONE_BUILD_NUMBER --variants linux-x64,linux-x64-musl,osx64,win64 --no-pull-enterprise
+  depends_on:
+  - initialize
+  - lint-backend
+  - test-backend
+
+- name: build-frontend
+  image: grafana/build-container:1.2.24
+  commands:
+  - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise
+  depends_on:
+  - initialize
+  - test-frontend
+
 - name: build-plugins
   image: grafana/build-container:1.2.24
   commands:
@@ -289,23 +289,6 @@ steps:
   depends_on:
   - initialize
 
-- name: build-backend
-  image: grafana/build-container:1.2.24
-  commands:
-  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id $DRONE_BUILD_NUMBER
-  depends_on:
-  - initialize
-  - lint-backend
-  - test-backend
-
-- name: build-frontend
-  image: grafana/build-container:1.2.24
-  commands:
-  - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise
-  depends_on:
-  - initialize
-  - test-frontend
-
 - name: test-backend
   image: grafana/build-container:1.2.24
   commands:
@@ -327,6 +310,23 @@ steps:
   depends_on:
   - initialize
 
+- name: build-backend
+  image: grafana/build-container:1.2.24
+  commands:
+  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id $DRONE_BUILD_NUMBER
+  depends_on:
+  - initialize
+  - lint-backend
+  - test-backend
+
+- name: build-frontend
+  image: grafana/build-container:1.2.24
+  commands:
+  - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise
+  depends_on:
+  - initialize
+  - test-frontend
+
 - name: build-plugins
   image: grafana/build-container:1.2.24
   commands:
diff --git a/scripts/lib.star b/scripts/lib.star
index a99f27e04f4..77cd49fd740 100644
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -32,10 +32,10 @@ def pr_pipelines(edition):
         lint_backend_step(edition),
         codespell_step(),
         shellcheck_step(),
-        build_backend_step(edition=edition, variants=variants),
-        build_frontend_step(edition=edition),
         test_backend_step(),
         test_frontend_step(),
+        build_backend_step(edition=edition, variants=variants),
+        build_frontend_step(edition=edition),
         build_plugins_step(edition=edition),
         package_step(edition=edition, variants=variants),
         e2e_tests_server_step(),
@@ -81,10 +81,10 @@ def master_pipelines(edition):
         lint_backend_step(edition),
         codespell_step(),
         shellcheck_step(),
-        build_backend_step(edition=edition),
-        build_frontend_step(edition=edition),
         test_backend_step(),
         test_frontend_step(),
+        build_backend_step(edition=edition),
+        build_frontend_step(edition=edition),
         build_plugins_step(edition=edition),
         package_step(edition=edition),
         e2e_tests_server_step(),