From: Michele Tartara <mtartara@google.com>
Date: Wed, 19 Jun 2013 08:24:01 +0000 (+0000)
Subject: Version bump to 2.9.0~alpha1
X-Git-Tag: v2.9.0beta1~204
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/ea2ee4b06c1d756105eaaeb1f5aa29e44a85e09e

Version bump to 2.9.0~alpha1

Bump the version number to 2.9.0~alpha1.

This also requires updating version numbers in cfgupgrade tool.

Furthermore, a data file for test representing a 2.8 configuration had the
version number set to 2.7 in order to prevent tests failing while the current
branch was artificially kept behind its actual version number. Now that alpha
versions are possible, it can be moved back to 2.8 as it was supposed to be.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
---

diff --git a/configure.ac b/configure.ac
index 3e3c0e9..e294337 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
-m4_define([gnt_version_minor], [8])
+m4_define([gnt_version_minor], [9])
 m4_define([gnt_version_revision], [0])
 m4_define([gnt_version_suffix], [~alpha1])
 m4_define([gnt_version_full],
diff --git a/test/data/cluster_config_2.8.json b/test/data/cluster_config_2.8.json
index b0dba99..e4dee4d 100644
--- a/test/data/cluster_config_2.8.json
+++ b/test/data/cluster_config_2.8.json
@@ -548,5 +548,5 @@
     }
   },
   "serial_no": 7625,
-  "version": 2070000
+  "version": 2080000
 }
diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index e239bd1..937efaf 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -52,11 +52,11 @@ args = None
 #: Target major version we will upgrade to
 TARGET_MAJOR = 2
 #: Target minor version we will upgrade to
-TARGET_MINOR = 8
+TARGET_MINOR = 9
 #: Target major version for downgrade
 DOWNGRADE_MAJOR = 2
 #: Target minor version for downgrade
-DOWNGRADE_MINOR = 7
+DOWNGRADE_MINOR = 8
 
 
 class Error(Exception):
@@ -485,8 +485,8 @@ def main():
                    config_minor, config_revision))
     DowngradeAll(config_data)
 
-  # Upgrade from 2.{0..7} to 2.8
-  elif config_major == 2 and config_minor in range(0, 9):
+  # Upgrade from 2.{0..7} to 2.9
+  elif config_major == 2 and config_minor in range(0, 10):
     if config_revision != 0:
       logging.warning("Config revision is %s, not 0", config_revision)
     UpgradeAll(config_data)