From 8461dc1391fc498fa6130d09296de3314dda2284 Mon Sep 17 00:00:00 2001
From: Prashanth Kumar <prkumar@purestorage.com>
Date: Mon, 27 May 2024 08:56:24 +0000
Subject: [PATCH] Makefile and travis file changes for 1.2.13 version

---
 .travis.yml                             | 4 ++--
 pkg/controllers/dataexport/reconcile.go | 6 +++---
 pkg/version/version.go                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62d89181f..1eb3db123 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ script:
   - |
     if [ -n "${TRAVIS_TAG}" ]; then
       export RELEASE_VER=${TRAVIS_TAG}
-    elif [ "${TRAVIS_BRANCH}" == "master" ]; then
-      export DOCKER_IMAGE_TAG=master-latest
+    elif [ "${TRAVIS_BRANCH}" == "1.2.13" ]; then
+      export DOCKER_IMAGE_TAG=1.2.13
     else
       export RELEASE_VER=`git rev-parse --short HEAD`
     fi
diff --git a/pkg/controllers/dataexport/reconcile.go b/pkg/controllers/dataexport/reconcile.go
index d3277151a..c764df49a 100644
--- a/pkg/controllers/dataexport/reconcile.go
+++ b/pkg/controllers/dataexport/reconcile.go
@@ -1137,9 +1137,9 @@ func (c *Controller) stageLocalSnapshotRestore(ctx context.Context, dataExport *
 		}
 		// Already done with max retries, so moving to kdmp restore anyway
 		data := updateDataExportDetail{
-			stage:  kdmpapi.DataExportStageTransferScheduled,
-			status: kdmpapi.DataExportStatusInitial,
-			reason: "switching to restore from objectstore bucket as restoring from local snapshot did not happen",
+			stage:                     kdmpapi.DataExportStageTransferScheduled,
+			status:                    kdmpapi.DataExportStatusInitial,
+			reason:                    "switching to restore from objectstore bucket as restoring from local snapshot did not happen",
 			resetLocalSnapshotRestore: true,
 		}
 		logrus.Infof("%v: In stageLocalSnapshotRestore stage, local snapshot restore failed, trying KDMP restore.", dataExport.Name)
diff --git a/pkg/version/version.go b/pkg/version/version.go
index b905af09c..4baf9fb0d 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -24,7 +24,7 @@ const (
 //
 // These variables typically come from -ldflags settings.
 var (
-	gitVersion = "master-latest"
+	gitVersion = "1.2.13"
 	gitCommit  = ""                     // sha1 from git, output of $(git rev-parse HEAD)
 	buildDate  = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
 	kbVerRegex = regexp.MustCompile(`^(v\d+\.\d+\.\d+)(.*)`)