From 4c7329d02b3f799dd80f8ba869d5c4935c34b427 Mon Sep 17 00:00:00 2001
From: Martin Kalcok <martin.kalcok@canonical.com>
Date: Fri, 13 Sep 2024 17:33:55 +0200
Subject: [PATCH] tests: Set upgrade channel to 24.03/beta

This branch of MicroOVN is based on OVN 24.09. That means that
it can no longer directly upgrade from current default MicroOVN
snap channel (22.03).

These changes set the base channel for upgrade tests to 24.03/beta

Note: Since the MicroOVN 24.03 does not have a 'stable' channel yet,
we need to use 'beta'

Signed-off-by: Martin Kalcok <martin.kalcok@canonical.com>
---
 tests/ovsdb_schema_upgrade.bats                                 | 1 -
 tests/ovsdb_schema_upgrade_24.03.bats                           | 1 +
 ...vsdb_schema_upgrade.bats => ovsdb_schema_upgrade_24.03.bats} | 0
 tests/test_helper/bats/{upgrade.bats => upgrade_24.03.bats}     | 0
 tests/test_helper/common.bash                                   | 2 +-
 tests/test_helper/setup_teardown/ovsdb_schema_upgrade.bash      | 1 -
 .../test_helper/setup_teardown/ovsdb_schema_upgrade_24.03.bash  | 1 +
 .../setup_teardown/{upgrade.bash => upgrade_24.03.bash}         | 0
 tests/upgrade.bats                                              | 1 -
 tests/upgrade_24.03.bats                                        | 1 +
 10 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 120000 tests/ovsdb_schema_upgrade.bats
 create mode 120000 tests/ovsdb_schema_upgrade_24.03.bats
 rename tests/test_helper/bats/{ovsdb_schema_upgrade.bats => ovsdb_schema_upgrade_24.03.bats} (100%)
 rename tests/test_helper/bats/{upgrade.bats => upgrade_24.03.bats} (100%)
 delete mode 120000 tests/test_helper/setup_teardown/ovsdb_schema_upgrade.bash
 create mode 120000 tests/test_helper/setup_teardown/ovsdb_schema_upgrade_24.03.bash
 rename tests/test_helper/setup_teardown/{upgrade.bash => upgrade_24.03.bash} (100%)
 delete mode 120000 tests/upgrade.bats
 create mode 120000 tests/upgrade_24.03.bats

diff --git a/tests/ovsdb_schema_upgrade.bats b/tests/ovsdb_schema_upgrade.bats
deleted file mode 120000
index 0be25395..00000000
--- a/tests/ovsdb_schema_upgrade.bats
+++ /dev/null
@@ -1 +0,0 @@
-test_helper/bats/ovsdb_schema_upgrade.bats
\ No newline at end of file
diff --git a/tests/ovsdb_schema_upgrade_24.03.bats b/tests/ovsdb_schema_upgrade_24.03.bats
new file mode 120000
index 00000000..0ff7f4e8
--- /dev/null
+++ b/tests/ovsdb_schema_upgrade_24.03.bats
@@ -0,0 +1 @@
+test_helper/bats/ovsdb_schema_upgrade_24.03.bats
\ No newline at end of file
diff --git a/tests/test_helper/bats/ovsdb_schema_upgrade.bats b/tests/test_helper/bats/ovsdb_schema_upgrade_24.03.bats
similarity index 100%
rename from tests/test_helper/bats/ovsdb_schema_upgrade.bats
rename to tests/test_helper/bats/ovsdb_schema_upgrade_24.03.bats
diff --git a/tests/test_helper/bats/upgrade.bats b/tests/test_helper/bats/upgrade_24.03.bats
similarity index 100%
rename from tests/test_helper/bats/upgrade.bats
rename to tests/test_helper/bats/upgrade_24.03.bats
diff --git a/tests/test_helper/common.bash b/tests/test_helper/common.bash
index d5625877..64dab1e4 100644
--- a/tests/test_helper/common.bash
+++ b/tests/test_helper/common.bash
@@ -173,7 +173,7 @@ function get_upgrade_test_version() {
             exit 1
         fi
 
-        upgrade_from_version="${upgrade_from_version}/stable"
+        upgrade_from_version="${upgrade_from_version}/beta"
     fi
     echo "$upgrade_from_version"
 }
diff --git a/tests/test_helper/setup_teardown/ovsdb_schema_upgrade.bash b/tests/test_helper/setup_teardown/ovsdb_schema_upgrade.bash
deleted file mode 120000
index 966defed..00000000
--- a/tests/test_helper/setup_teardown/ovsdb_schema_upgrade.bash
+++ /dev/null
@@ -1 +0,0 @@
-upgrade.bash
\ No newline at end of file
diff --git a/tests/test_helper/setup_teardown/ovsdb_schema_upgrade_24.03.bash b/tests/test_helper/setup_teardown/ovsdb_schema_upgrade_24.03.bash
new file mode 120000
index 00000000..8ecd6b19
--- /dev/null
+++ b/tests/test_helper/setup_teardown/ovsdb_schema_upgrade_24.03.bash
@@ -0,0 +1 @@
+upgrade_24.03.bash
\ No newline at end of file
diff --git a/tests/test_helper/setup_teardown/upgrade.bash b/tests/test_helper/setup_teardown/upgrade_24.03.bash
similarity index 100%
rename from tests/test_helper/setup_teardown/upgrade.bash
rename to tests/test_helper/setup_teardown/upgrade_24.03.bash
diff --git a/tests/upgrade.bats b/tests/upgrade.bats
deleted file mode 120000
index 7cddcf89..00000000
--- a/tests/upgrade.bats
+++ /dev/null
@@ -1 +0,0 @@
-test_helper/bats/upgrade.bats
\ No newline at end of file
diff --git a/tests/upgrade_24.03.bats b/tests/upgrade_24.03.bats
new file mode 120000
index 00000000..24136247
--- /dev/null
+++ b/tests/upgrade_24.03.bats
@@ -0,0 +1 @@
+test_helper/bats/upgrade_24.03.bats
\ No newline at end of file