set desired_version to correct value (#321)

cloud-bulldozer · Sep 13, 2021 · aa566f7 · aa566f7
1 parent f599d52
commit aa566f7
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/snafu/upgrade_openshift_wrapper/trigger_upgrade.py b/snafu/upgrade_openshift_wrapper/trigger_upgrade.py
@@ -116,7 +116,15 @@ def _run_upgrade(self):
             the_time = datetime.datetime.strptime(
                 clusterversion.get().attributes.items[0].status.history[0].completionTime, time_format
             )
-            return init_version, desired_version, platform, the_time, the_time, (the_time - the_time)
+            return (
+                init_version,
+                desired_version,
+                desired_version,
+                platform,
+                the_time,
+                the_time,
+                (the_time - the_time),
+            )
 
         c_state = "incomplete"
         c_version = "0.0.0"
@@ -161,7 +169,7 @@ def _run_upgrade(self):
         total_time = end_time - start_time
         logger.info("Total upgrade time: %s" % total_time)
 
-        return init_version, new_version, platform, start_time, end_time, total_time
+        return init_version, desired_version, new_version, platform, start_time, end_time, total_time
 
     def get_timings(self):
         logger.info("Getting timing stats from cluster Operators")
@@ -199,6 +207,7 @@ def emit_actions(self):
         self.timestamp = time.strftime("%Y-%m-%dT%H:%M:%S")
         (
             self.init_version,
+            self.desired_version,
             self.end_version,
             self.platform,
             self.start_time,
@@ -218,10 +227,12 @@ def emit_actions(self):
         docs.append(self._json_payload(data))
         for item in docs:
             yield item, ""
-        if self.end_version != desired_version:
+        if self.end_version != self.desired_version:
             logger.error("Cluster did not upgrade to desired version")
             logger.error(
-                "Cluster version is {} and desired version is {}".format(self.end_version, desired_version)
+                "Cluster version is {} and desired version is {}".format(
+                    self.end_version, self.desired_version
+                )
             )
             exit(1)
-        logger.info("Finished upgrading the cluster to version %s" % (desired_version))
+        logger.info("Finished upgrading the cluster to version %s" % (self.desired_version))