[lxc-devel] [lxd/master] Re-enable clustering upgrade test

[freeekanayaka on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 361 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200117/4643e50d/attachment.bin>
-------------- next part --------------
From 084f4d3a4a04e8962a8dc29342a743f637aa01bd Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanayaka at canonical.com>
Date: Fri, 17 Jan 2020 09:55:08 +0000
Subject: [PATCH] Re-enable clustering upgrade test

Signed-off-by: Free Ekanayaka <free.ekanayaka at canonical.com>
---
 shared/version/api.go     | 2 +-
 test/main.sh              | 2 +-
 test/suites/clustering.sh | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shared/version/api.go b/shared/version/api.go
index 11bc3f0bb8..95985665cb 100644
--- a/shared/version/api.go
+++ b/shared/version/api.go
@@ -190,7 +190,7 @@ func APIExtensionsCount() int {
 	count := len(APIExtensions)
 
 	// This environment variable is an internal one to force the code
-	// to believe that we an API extensions version greater than we
+	// to believe that we have an API extensions count greater than we
 	// actually have. It's used by integration tests to exercise the
 	// cluster upgrade process.
 	artificialBump := os.Getenv("LXD_ARTIFICIALLY_BUMP_API_EXTENSIONS")
diff --git a/test/main.sh b/test/main.sh
index e9ec55c805..ab098a5f48 100755
--- a/test/main.sh
+++ b/test/main.sh
@@ -180,7 +180,7 @@ run_test test_clustering_dns "clustering DNS"
 run_test test_clustering_recover "clustering recovery"
 run_test test_clustering_handover "clustering handover"
 run_test test_clustering_rebalance "clustering rebalance"
-#run_test test_clustering_upgrade "clustering upgrade"
+run_test test_clustering_upgrade "clustering upgrade"
 run_test test_projects_default "default project"
 run_test test_projects_crud "projects CRUD operations"
 run_test test_projects_containers "containers inside projects"
diff --git a/test/suites/clustering.sh b/test/suites/clustering.sh
index aca28d387b..cea19fcfbc 100644
--- a/test/suites/clustering.sh
+++ b/test/suites/clustering.sh
@@ -678,6 +678,8 @@ test_clustering_network() {
   kill_lxd "${LXD_TWO_DIR}"
 }
 
+# Perform an upgrade of a 2-member cluster, then a join a third member and
+# perform one more upgrade
 test_clustering_upgrade() {
   # shellcheck disable=2039
   local LXD_DIR LXD_NETNS