Skip to content

Commit

Permalink
fixing buildkite (#6674)
Browse files Browse the repository at this point in the history
Signed-off-by: Durga Sarat Chandra Maddu <[email protected]>
  • Loading branch information
Dmaddu committed Feb 23, 2022
1 parent 78633f0 commit fdbeb0c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion components/automate-cli/cmd/chef-automate/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func statusUpgradeCmd(cmd *cobra.Command, args []string) error {
switch resp.State {
case api.UpgradeStatusResponse_IDLE:
switch {
//Todo(milestone) - update the comparision logic of current version and latest available version
//Todo(milestone) - update the comparison logic of current version and latest available version
case resp.CurrentVersion != "" && resp.CurrentVersion < resp.LatestAvailableVersion:
writer.Printf("Automate is out-of-date (current version: %s; latest available: %s; airgapped: %v)\n",
resp.CurrentVersion, resp.LatestAvailableVersion, resp.IsAirgapped)
Expand Down
2 changes: 1 addition & 1 deletion components/automate-deployment/pkg/converge/compiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ func (phase *SelfUpgradePhase) Run(writer *eventWriter) error {
if err != nil {
return errors.Wrapf(err, "Could not parse deployment-service release %s", desiredReleaseStr)
}
//Todo(milestone) check if this code involves in upgrade process, if so modify the below comparision
//Todo(milestone) check if this code involves in upgrade process, if so modify the below comparison
if curRel < desRel {
// only upgrade if the release is newer. this is a safety net for
// the following situation: customers upgrading from a version of a2
Expand Down
2 changes: 1 addition & 1 deletion components/automate-deployment/pkg/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ func (s *server) convergeDeployment() error {
"next_manifest": nextVersion,
})
if nextVersion > currentVersion {
//Todo(milestone) modify the comparision logic, should not use simple less than or greater than
//Todo(milestone) modify the comparison logic, should not use simple less than or greater than
logctx.Info("Starting converge with UPDATED manifest")
} else if nextVersion < currentVersion {
// We should not see this because of the current implementation of
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func detectUpgradingServices(a2Manifest *manifest.A2,
//
// Our standard data format of YYYYMMDDHHMMSS
// is lexicographically sortable.
//Todo(milestone) recheck the below comparision logic for semantic versioning format
//Todo(milestone) recheck the below comparison logic for semantic versioning format
if svc.Pkg.Release < deploymentService.Release() {
upgradingService := makeUpgradingService(&svc, deploymentService)
ret = append(ret, upgradingService)
Expand Down

0 comments on commit fdbeb0c

Please sign in to comment.