Merge branch 'master' into agent-config-environment-uuid

howbazaar · howbazaar · commit 4e170cabfcac · 2015-01-19T13:06:43.000+13:00
diff --git a/upgrades/operations.go b/upgrades/operations.go
@@ -76,9 +76,17 @@ func newOpsIterator(from, to version.Number, ops []Operation) *opsIterator {
 	if from == version.Zero {
 		from = version.MustParse("1.16.0")
 	}
+
 	// Clear the version tag of the target release to ensure that all
-	// upgrade steps for the release are run for alpha and beta releases.
-	to.Tag = ""
+	// upgrade steps for the release are run for alpha and beta
+	// releases.
+	// ...but only do this if the agent version has actually changed,
+	// lest we trigger upgrade mode unnecessarily for non-final
+	// versions.
+	if from.Compare(to) != 0 {
+		to.Tag = ""
+	}
+
 	return &opsIterator{
 		from:    from,
 		to:      to,
diff --git a/upgrades/upgrade_test.go b/upgrades/upgrade_test.go
@@ -330,6 +330,18 @@ var areUpgradesDefinedTests = []areUpgradesDefinedTest{
 		fromVersion: "",
 		expected:    true,
 	},
+	{
+		about:       "upgrade between pre-final versions",
+		fromVersion: "1.21-beta4",
+		toVersion:   "1.21-beta5",
+		expected:    true,
+	},
+	{
+		about:       "no upgrades when version hasn't changed, even with release tags",
+		fromVersion: "1.21-beta5",
+		toVersion:   "1.21-beta5",
+		expected:    false,
+	},
 }
 
 func (s *upgradeSuite) TestAreUpgradesDefined(c *gc.C) {
@@ -500,6 +512,20 @@ var upgradeTests = []upgradeTest{
 		targets:       targets(upgrades.HostMachine),
 		expectedSteps: []string{"step 1 - 1.20.0", "step 2 - 1.20.0", "step 1 - 1.21.0"},
 	},
+	{
+		about:         "nothing happens when the version hasn't changed but contains a tag",
+		fromVersion:   "1.21-alpha1",
+		toVersion:     "1.21-alpha1",
+		targets:       targets(upgrades.DatabaseMaster),
+		expectedSteps: []string{},
+	},
+	{
+		about:         "upgrades between pre-final versions should run steps for the final version",
+		fromVersion:   "1.21-beta2",
+		toVersion:     "1.21-beta3",
+		targets:       targets(upgrades.DatabaseMaster),
+		expectedSteps: []string{"state step 1 - 1.21.0", "step 1 - 1.21.0"},
+	},
 }
 
 func (s *upgradeSuite) TestPerformUpgrade(c *gc.C) {
