[feat]: [CI-13358]: Show stage savings for cache intel (#299)

* [feat]: [CI-13358]: Show stage savings for cache intel * Update runtest.go * rename * Update savings.go
harness · Jul 8, 2024 · 2fa6f03 · 2fa6f03
1 parent e069a15
commit 2fa6f03
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/pipeline/runtime/common.go b/pipeline/runtime/common.go
@@ -13,6 +13,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/drone/runner-go/pipeline/runtime"
 	v2 "github.com/harness/godotenv/v2"
 	v3 "github.com/harness/godotenv/v3"
 	"github.com/harness/lite-engine/api"
@@ -206,3 +207,11 @@ func waitForZipUnlock(timeout time.Duration, tiConfig *tiCfg.Cfg) error {
 		}
 	}
 }
+
+// checkStepSuccess checks if the step was successful based on the return values
+func checkStepSuccess(state *runtime.State, err error) bool {
+	if err == nil && state != nil && state.ExitCode == 0 && state.Exited {
+		return true
+	}
+	return false
+}
diff --git a/pipeline/runtime/run.go b/pipeline/runtime/run.go
@@ -102,7 +102,7 @@ func executeRunStep(ctx context.Context, f RunFunc, r *api.StartStepRequest, out
 
 	// Parse and upload savings to TI
 	if tiConfig.GetParseSavings() {
-		optimizationState = savings.ParseAndUploadSavings(ctx, r.WorkingDir, log, step.Name, timeTakenMs, tiConfig, r.Envs)
+		optimizationState = savings.ParseAndUploadSavings(ctx, r.WorkingDir, log, step.Name, checkStepSuccess(exited, err), timeTakenMs, tiConfig, r.Envs)
 	}
 
 	useCINewGodotEnvVersion := false

diff --git a/pipeline/runtime/runtest.go b/pipeline/runtime/runtest.go
@@ -82,7 +82,7 @@ func executeRunTestStep(ctx context.Context, f RunFunc, r *api.StartStepRequest,
 
 	// Parse and upload savings to TI
 	if tiConfig.GetParseSavings() {
-		optimizationState = savings.ParseAndUploadSavings(ctx, r.WorkingDir, log, step.Name, timeTakenMs, tiConfig, r.Envs)
+		optimizationState = savings.ParseAndUploadSavings(ctx, r.WorkingDir, log, step.Name, checkStepSuccess(exited, err), timeTakenMs, tiConfig, r.Envs)
 	}
 
 	useCINewGodotEnvVersion := false

diff --git a/pipeline/runtime/runtestsV2.go b/pipeline/runtime/runtestsV2.go
@@ -127,7 +127,7 @@ func executeRunTestsV2Step(ctx context.Context, f RunFunc, r *api.StartStepReque
 	}
 
 	if tiConfig.GetParseSavings() {
-		optimizationState = savings.ParseAndUploadSavings(ctx, r.WorkingDir, log, step.Name, timeTakenMs, tiConfig, r.Envs)
+		optimizationState = savings.ParseAndUploadSavings(ctx, r.WorkingDir, log, step.Name, checkStepSuccess(exited, err), timeTakenMs, tiConfig, r.Envs)
 	}
 
 	useCINewGodotEnvVersion := false

diff --git a/ti/savings/savings.go b/ti/savings/savings.go
@@ -13,7 +13,9 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func ParseAndUploadSavings(ctx context.Context, workspace string, log *logrus.Logger, stepID string, cmdTimeTaken int64,
+const restoreCacheHarnessStepID = "restore-cache-harness"
+
+func ParseAndUploadSavings(ctx context.Context, workspace string, log *logrus.Logger, stepID string, stepSuccess bool, cmdTimeTaken int64,
 	tiConfig *tiCfg.Cfg, envs map[string]string) types.IntelligenceExecutionState {
 	states := make([]types.IntelligenceExecutionState, 0)
 	// Cache Savings
@@ -62,7 +64,16 @@ func ParseAndUploadSavings(ctx context.Context, workspace string, log *logrus.Lo
 			}
 		}
 	}
-	// Cache Intel savings (Placeholder)
+
+	// Cache Intel savings
+	if stepID == restoreCacheHarnessStepID {
+		cacheIntelState := types.FULL_RUN
+		if stepSuccess {
+			cacheIntelState = types.OPTIMIZED
+		}
+		states = append(states, cacheIntelState)
+	}
+
 	return getStepState(states)
 }