From 740b68c23da552d6158167744d97aea861da5bd9 Mon Sep 17 00:00:00 2001
From: Leonid Fedorov <leonid.fedorov@mariadb.com>
Date: Mon, 27 Jan 2025 13:28:06 +0000
Subject: [PATCH] move upgrade tests to the last phase

---
 .drone.jsonnet | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index d1cd82dbc..52e536066 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -344,7 +344,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
   },
   upgrade(version):: {
     name: 'upgrade-test from ' + version,
-    depends_on: ['smoke'],
+    depends_on: ['regressionlog'],
     image: 'docker',
     volumes: [pipeline._volumes.docker],
     environment: {
@@ -866,14 +866,14 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
          [pipeline.cmapitest] +
          [pipeline.cmapilog] +
          [pipeline.publish('cmapilog')] +
-         [pipeline.upgrade(mdb_server_versions[i]) for i in indexes(mdb_server_versions)] +
-         (if (std.length(mdb_server_versions) == 0) then [] else [pipeline.upgradelog] + [pipeline.publish('upgradelog')]) +
          (if (platform == 'rockylinux:8' && arch == 'amd64') then [pipeline.dockerfile] + [pipeline.dockerhub] + [pipeline.multi_node_mtr] else [pipeline.mtr] + [pipeline.publish('mtr')] + [pipeline.mtrlog] + [pipeline.publish('mtrlog')]) +
          (if (event == 'cron' && platform == 'rockylinux:8' && arch == 'amd64') then [pipeline.publish('mtr latest', 'latest')] else []) +
          [pipeline.prepare_regression] +
          [pipeline.regression(regression_tests[i], [if (i == 0) then 'prepare regression' else regression_tests[i - 1]]) for i in indexes(regression_tests)] +
          [pipeline.regressionlog] +
          [pipeline.publish('regressionlog')] +
+         [pipeline.upgrade(mdb_server_versions[i]) for i in indexes(mdb_server_versions)] +
+         (if (std.length(mdb_server_versions) == 0) then [] else [pipeline.upgradelog] + [pipeline.publish('upgradelog')]) +
          (if (event == 'cron') then [pipeline.publish('regressionlog latest', 'latest')] else []),
 
   volumes: [pipeline._volumes.mdb { temp: {} }, pipeline._volumes.docker { host: { path: '/var/run/docker.sock' } }],