.

Author: eranturgeman

commands/audit/audit.go

@@ -222,8 +222,8 @@ func ProcessResultsAndOutput(auditResults *results.SecurityCommandResults, outpu
 		return
 	}
 	// Only in case Xray's context was given (!auditCmd.IncludeVulnerabilities), and the user asked to fail the build accordingly, do so.
-	// TODO eran fix the failBuild condition here as well and fix all relevant tests accordingly (run in CI)
-	if failBuild && !auditResults.ResultContext.IncludeVulnerabilities && results.CheckIfFailBuild(auditResults.GetScaScansXrayResults()) {
+	// TODO eran fix the failBuild condition here as well and fix all relevant tests accordingly (run in CI) - fixed
+	if failBuild && auditResults.HasViolationContext() && results.CheckIfFailBuild(auditResults.GetScaScansXrayResults()) {
 		err = results.NewFailBuildError()
 	}
 	return

git_test.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"path/filepath"
 	"testing"
 
@@ -89,9 +88,12 @@ func TestGitAuditSimpleJson(t *testing.T) {
 
 // TODO eran fix this flaky test - remove Ubuntu restriction in local
 func TestGitAuditViolationsWithIgnoreRule(t *testing.T) {
-	if !coreutils.IsLinux() {
-		t.Skip("Skipping test. This test only runs on Linux to avoid flaky tests when running in parallel tests.")
-	}
+	/*
+		if !coreutils.IsLinux() {
+			t.Skip("Skipping test. This test only runs on Linux to avoid flaky tests when running in parallel tests.")
+		}
+
+	*/
 	xrayVersion, xscVersion, testCleanUp := integration.InitGitTest(t, services.MinXrayVersionGitRepoKey)
 	defer testCleanUp()
 
@@ -106,7 +108,7 @@ func TestGitAuditViolationsWithIgnoreRule(t *testing.T) {
 	// Run the audit command with git repo and verify violations are reported to the platform.
 	createTestProjectRunGitAuditAndValidate(t, projectPath,
 		auditCommandTestParams{Format: string(format.SimpleJson), WithLicense: true, WithVuln: true},
-		xrayVersion, xscVersion, "",
+		xrayVersion, xscVersion, "One or more of the detected violations are configured to fail the build that including them",
 		validations.ValidationParams{
 			Total: &validations.TotalCount{Licenses: 3, Violations: 12, Vulnerabilities: 12},
 			// Check that we have at least one violation for each scan type. (IAC is not supported yet)