Executor messaging error checks should only fail on our CI, not gener…

…ic CI.
ActiveState · Oct 16, 2023 · c4cf2d8 · c4cf2d8
1 parent faebd57
commit c4cf2d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmd/state-exec/condition.go b/cmd/state-exec/condition.go
@@ -2,7 +2,7 @@ package main
 
 import "os"
 
-// onCI is copied from the internal/condition package (to minimize depdencies).
-func onCI() bool {
-	return os.Getenv("CI") != "" || os.Getenv("BUILDER_OUTPUT") != ""
+// inActiveStateCI is copied from the internal/condition package (to minimize dependencies).
+func inActiveStateCI() bool {
+	return os.Getenv("ACTIVESTATE_CI") == "true"
 }
diff --git a/cmd/state-exec/main.go b/cmd/state-exec/main.go
@@ -87,7 +87,7 @@ func run() error {
 	if err := sendMsgToService(meta.SockPath, hb); err != nil {
 		logr.Debug("                 sock - error: %v", err)
 
-		if onCI() { // halt control flow on CI only
+		if inActiveStateCI() { // halt control flow on CI only
 			return fmt.Errorf("cannot send message to service (this error is handled in CI only): %w", err)
 		}
 	}
@@ -108,7 +108,7 @@ func run() error {
 	if err := sendMsgToService(meta.SockPath, msg); err != nil {
 		logr.Debug("                 sock - error: %v", err)
 
-		if onCI() { // halt control flow on CI only
+		if inActiveStateCI() { // halt control flow on CI only
 			return fmt.Errorf("cannot send message to service (this error is handled in CI only): %w", err)
 		}
 	}