E2e tests rt vsc more tools

conan_test.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"testing"
 
 	buildinfo "github.com/jfrog/build-info-go/entities"
@@ -1162,3 +1163,54 @@ func TestConanBuildPublishWithCIVcsProps(t *testing.T) {
 
 	assert.Greater(t, artifactCount, 0, "No artifacts were validated for CI VCS properties")
 }
+
+// TestConanUploadWithLocalGitVcsProps verifies civcs local git fallback on conan upload.
+func TestConanUploadWithLocalGitVcsProps(t *testing.T) {
+	initConanTest(t)
+
+	buildName := tests.ConanBuildName + "-local-git"
+	buildNumber := "1"
+
+	cleanupEnv := tests.SetupLocalGitVcsEnv(t)
+	defer cleanupEnv()
+
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+	defer inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+
+	projectPath := createConanProject(t, "conan-local-git")
+	tests.CopyGitFixtureIntoProject(t, projectPath)
+
+	conanfile := filepath.Join(projectPath, "conanfile.py")
+	data, err := os.ReadFile(conanfile)
+	require.NoError(t, err)
+	patched := strings.ReplaceAll(string(data), `name = "cli-test-package"`, `name = "cli-test-package-local-git"`)
+	require.NoError(t, os.WriteFile(conanfile, []byte(patched), 0o644)) //#nosec G703 -- test code, path built from createConanProject temp dir
+
+	wd, err := os.Getwd()
+	require.NoError(t, err)
+	chdirCallback := clientTestUtils.ChangeDirWithCallback(t, wd, projectPath)
+	defer chdirCallback()
+
+	configureConanRemote(t)
+	defer cleanupConanRemote()
+
+	jfrogCli := coretests.NewJfrogCli(execMain, "jfrog", "")
+	require.NoError(t, jfrogCli.Exec("conan", "create", ".", "--build=missing",
+		"--build-name="+buildName, "--build-number="+buildNumber))
+	require.NoError(t, jfrogCli.Exec("conan", "upload", "cli-test-package-local-git/*",
+		"-r", tests.ConanLocalRepo, "--confirm",
+		"--build-name="+buildName, "--build-number="+buildNumber))
+
+	require.NoError(t, artifactoryCli.Exec("bp", buildName, buildNumber))
+
+	publishedBuildInfo, found, err := tests.GetBuildInfo(serverDetails, buildName, buildNumber)
+	require.NoError(t, err)
+	require.True(t, found)
+
+	serviceManager, err := utils.CreateServiceManager(serverDetails, 3, 1000, false)
+	require.NoError(t, err)
+
+	count := tests.ValidateLocalGitVcsPropsOnBuildInfoArtifacts(t, serviceManager, publishedBuildInfo, tests.ConanLocalRepo,
+		tests.VcsFixtureMainURL, tests.VcsFixtureMainRevision, tests.VcsFixtureMainBranch)
+	assert.Greater(t, count, 0)
+}

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/jfrog/build-info-go v1.13.1-0.20260615080618-42488b58c305
 	github.com/jfrog/gofrog v1.7.6
 	github.com/jfrog/jfrog-cli-application v1.0.2-0.20260621072921-cadb78770a3e
-	github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260701085637-6ba50cd3676f
+	github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260702071632-62c27c48b207
 	github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260624085155-5ba797de2616
 	github.com/jfrog/jfrog-cli-evidence v0.9.5-0.20260618135203-4d2bdd4ee35f
 	github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20260618062042-6053ab368cab

go.sum

@@ -67,6 +67,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/attiasas/jfrog-cli-artifactory v0.0.0-20260701102442-59ed24167b6c h1:oyOqDGLhx7Mqf3zr0K/TkCyAM/kBtMvW/yjdoujTWGs=
+github.com/attiasas/jfrog-cli-artifactory v0.0.0-20260701102442-59ed24167b6c/go.mod h1:VqV0Bed11HoBlugAEGa3RumbwnDVslEf0gKocTzLs9s=
 github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6tLY8=
 github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc=
 github.com/aws/aws-sdk-go-v2/config v1.32.17 h1:FpL4/758/diKwqbytU0prpuiu60fgXKUWCpDJtApclU=
@@ -406,8 +408,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL
 github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
 github.com/jfrog/jfrog-cli-application v1.0.2-0.20260621072921-cadb78770a3e h1:jUfQzLCVbUazw7FEXf3+57vQheDSHa/Px/Gp4pf/sNI=
 github.com/jfrog/jfrog-cli-application v1.0.2-0.20260621072921-cadb78770a3e/go.mod h1:p8yLtbmCxxQucIbLZKnWu0F+EDtj6NLXbRQCEK/nb6o=
-github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260701085637-6ba50cd3676f h1:PMq0iTjH/H40BEL/RzBwXFt7JMb+CQBaVmScdbZaeRI=
-github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260701085637-6ba50cd3676f/go.mod h1:VqV0Bed11HoBlugAEGa3RumbwnDVslEf0gKocTzLs9s=
+github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260702071632-62c27c48b207 h1:RbqWYCj0Iw1IGO9gW7ghEHV8L2xnMjDUulDnNHOstVM=
+github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260702071632-62c27c48b207/go.mod h1:VqV0Bed11HoBlugAEGa3RumbwnDVslEf0gKocTzLs9s=
 github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260624085155-5ba797de2616 h1:bioFXGzf3pF2qnC3LZD1S1saWiHSekL4vdsDSWksj/4=
 github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260624085155-5ba797de2616/go.mod h1:9R90mhbczGXwW5EGlDs7F08ejQU/xdoDhYHMvzBiqgE=
 github.com/jfrog/jfrog-cli-evidence v0.9.5-0.20260618135203-4d2bdd4ee35f h1:MV4BATdkEoUYJmdPDvaB9EBb8JQZg28n/K4X7dcmyAY=

go_test.go

@@ -469,23 +469,20 @@ func TestGoBuildPublishWithCIVcsProps(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Verify VCS properties on each artifact from build info
-	// Use same fallback logic as CI VCS: OriginalDeploymentRepo + Path, or Path directly
 	artifactCount := 0
 	for _, module := range publishedBuildInfo.BuildInfo.Modules {
 		for _, artifact := range module.Artifacts {
-			var fullPath string
-			switch {
-			case artifact.OriginalDeploymentRepo != "":
-				fullPath = artifact.OriginalDeploymentRepo + "/" + artifact.Path
-			case artifact.Path != "":
-				fullPath = artifact.Path
-			default:
-				continue // Skip artifacts without any path info
+			fullPath := tests.ArtifactFullPath(artifact, tests.GoRepo)
+			if fullPath == "" {
+				continue
 			}
 
 			props, err := serviceManager.GetItemProps(fullPath)
 			assert.NoError(t, err, "Failed to get properties for artifact: %s", fullPath)
 			assert.NotNil(t, props, "Properties are nil for artifact: %s", fullPath)
+			if props == nil {
+				continue
+			}
 
 			// Validate VCS properties
 			assert.Contains(t, props.Properties, "vcs.provider", "Missing vcs.provider on %s", artifact.Name)
@@ -503,3 +500,57 @@ func TestGoBuildPublishWithCIVcsProps(t *testing.T) {
 
 	assert.Greater(t, artifactCount, 0, "No artifacts were validated for CI VCS properties")
 }
+
+// TestGoPublishWithLocalGitVcsProps tests that local git VCS properties are set on Go artifacts
+// when running go-publish followed by build-publish with VCS collection enabled and no CI env.
+func TestGoPublishWithLocalGitVcsProps(t *testing.T) {
+	_, cleanUpFunc := initGoTest(t)
+	defer cleanUpFunc()
+
+	buildName := tests.GoBuildName + "-local-git"
+	buildNumber := "1"
+
+	cleanupEnv := tests.SetupLocalGitVcsEnv(t)
+	defer cleanupEnv()
+
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+	defer inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+
+	wd, err := os.Getwd()
+	assert.NoError(t, err, "Failed to get current dir")
+
+	projectPath := createGoProject(t, "project1", true)
+	testdataTarget := filepath.Join(tests.Out, "testdata")
+	testdataSrc := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "go", "testdata")
+	require.NoError(t, biutils.CopyDir(testdataSrc, testdataTarget, true, nil))
+	configFileDir := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "go", "project1", ".jfrog", "projects")
+	_, err = tests.ReplaceTemplateVariables(filepath.Join(configFileDir, "go.yaml"), filepath.Join(projectPath, ".jfrog", "projects"))
+	require.NoError(t, err)
+
+	tests.CopyGitFixtureIntoProject(t, projectPath)
+	require.FileExists(t, filepath.Join(projectPath, ".git", "HEAD"))
+	clientTestUtils.ChangeDirAndAssert(t, projectPath)
+	defer clientTestUtils.ChangeDirAndAssert(t, wd)
+	log.Info("Using Go project located at", projectPath)
+
+	jfrogCli := coretests.NewJfrogCli(execMain, "jfrog", "")
+	err = execGo(jfrogCli, "go", "build", "--mod=mod", "--build-name="+buildName, "--build-number="+buildNumber)
+	assert.NoError(t, err)
+
+	err = execGo(jfrogCli, "gp", "--build-name="+buildName, "--build-number="+buildNumber, "v1.0.0")
+	assert.NoError(t, err)
+
+	err = execGo(artifactoryCli, "bp", buildName, buildNumber)
+	assert.NoError(t, err)
+
+	publishedBuildInfo, found, err := tests.GetBuildInfo(serverDetails, buildName, buildNumber)
+	assert.NoError(t, err)
+	assert.True(t, found, "Build info was not found")
+
+	serviceManager, err := utils.CreateServiceManager(serverDetails, 3, 1000, false)
+	assert.NoError(t, err)
+
+	artifactCount := tests.ValidateLocalGitVcsPropsOnBuildInfoArtifacts(t, serviceManager, publishedBuildInfo,
+		tests.GoRepo, tests.VcsFixtureMainURL, tests.VcsFixtureMainRevision, tests.VcsFixtureMainBranch)
+	assert.Greater(t, artifactCount, 0)
+}

gradle_test.go

@@ -707,11 +707,14 @@ func TestGradleBuildPublishWithCIVcsProps(t *testing.T) {
 	artifactCount := 0
 	for _, module := range publishedBuildInfo.BuildInfo.Modules {
 		for _, artifact := range module.Artifacts {
-			fullPath := artifact.OriginalDeploymentRepo + "/" + artifact.Path
+			fullPath := tests.ArtifactFullPath(artifact, tests.GradleRepo)
 
 			props, err := serviceManager.GetItemProps(fullPath)
 			assert.NoError(t, err, "Failed to get properties for artifact: %s", fullPath)
 			assert.NotNil(t, props, "Properties are nil for artifact: %s", fullPath)
+			if props == nil {
+				continue
+			}
 
 			// Validate VCS properties
 			assert.Contains(t, props.Properties, "vcs.provider", "Missing vcs.provider on %s", artifact.Name)
@@ -730,3 +733,104 @@ func TestGradleBuildPublishWithCIVcsProps(t *testing.T) {
 
 	cleanGradleTest(t)
 }
+
+// TestGradleBuildPublishWithLocalGitVcsProps tests that local git VCS properties are set on Gradle artifacts
+// when running build-publish with VCS collection enabled and no CI env.
+// Uses the traditional Gradle extractor path (not FlexPack) because SetCIVcsPropsToConfig
+// injects local git props into the extractor config; FlexPack only sets build.* props on publish.
+func TestGradleBuildPublishWithLocalGitVcsProps(t *testing.T) {
+	initGradleTest(t)
+	buildName := "gradle-local-git-test"
+	buildNumber := "1"
+
+	cleanupEnv := tests.SetupLocalGitVcsEnv(t)
+	defer cleanupEnv()
+
+	_ = os.Unsetenv("JFROG_RUN_NATIVE")
+
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+	defer inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+
+	buildGradlePath := createGradleProject(t, "gradleproject")
+	projectDir := filepath.Dir(buildGradlePath)
+	tests.CopyGitFixtureIntoProject(t, projectDir)
+	require.FileExists(t, filepath.Join(projectDir, ".git", "HEAD"))
+
+	configFilePath := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "buildspecs", tests.GradleConfig)
+	createConfigFile(filepath.Join(projectDir, ".jfrog", "projects"), configFilePath, t)
+
+	oldHomeDir := changeWD(t, projectDir)
+	defer clientTestUtils.ChangeDirAndAssert(t, oldHomeDir)
+
+	buildGradlePath = strings.ReplaceAll(buildGradlePath, `\`, "/")
+	runJfrogCli(t, "gradle", "clean", "artifactoryPublish", "-b"+buildGradlePath, "--build-name="+buildName, "--build-number="+buildNumber)
+
+	assert.NoError(t, artifactoryCli.Exec("bp", buildName, buildNumber))
+
+	clientTestUtils.ChangeDirAndAssert(t, oldHomeDir)
+
+	var publishedBuildInfo *buildinfo.PublishedBuildInfo
+	var found bool
+	assert.Eventuallyf(t, func() bool {
+		var biErr error
+		publishedBuildInfo, found, biErr = tests.GetBuildInfo(serverDetails, buildName, buildNumber)
+		return biErr == nil && found
+	}, 30*time.Second, 2*time.Second, "Build info was not found for %s/%s", buildName, buildNumber)
+	if !found || publishedBuildInfo == nil {
+		return
+	}
+
+	serviceManager, err := utils.CreateServiceManager(serverDetails, 3, 1000, false)
+	assert.NoError(t, err)
+
+	artifactCount := tests.ValidateLocalGitVcsPropsOnBuildInfoArtifacts(t, serviceManager, publishedBuildInfo,
+		tests.GradleRepo, tests.VcsFixtureMainURL, tests.VcsFixtureMainRevision, tests.VcsFixtureMainBranch)
+	assert.Greater(t, artifactCount, 0)
+
+	cleanGradleTest(t)
+}
+
+// TestGradleFlexPackPublishWithLocalGitVcsProps verifies local git VCS on FlexPack publish path.
+func TestGradleFlexPackPublishWithLocalGitVcsProps(t *testing.T) {
+	initGradleTest(t)
+	buildName := "gradle-flexpack-local-git"
+	buildNumber := "1"
+
+	cleanupEnv := tests.SetupLocalGitVcsEnv(t)
+	defer cleanupEnv()
+
+	setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, "JFROG_RUN_NATIVE", "true")
+	defer setEnvCallBack()
+
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+	defer inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+
+	buildGradlePath := createGradleProject(t, "civcsproject")
+	projectDir := filepath.Dir(buildGradlePath)
+	tests.CopyGitFixtureIntoProject(t, projectDir)
+
+	oldHomeDir := changeWD(t, projectDir)
+	defer clientTestUtils.ChangeDirAndAssert(t, oldHomeDir)
+
+	runJfrogCli(t, "gradle", "clean", "publish", "--build-name="+buildName, "--build-number="+buildNumber)
+	require.NoError(t, artifactoryCli.Exec("bp", buildName, buildNumber))
+
+	clientTestUtils.ChangeDirAndAssert(t, oldHomeDir)
+
+	var publishedBuildInfo *buildinfo.PublishedBuildInfo
+	var found bool
+	require.Eventually(t, func() bool {
+		var biErr error
+		publishedBuildInfo, found, biErr = tests.GetBuildInfo(serverDetails, buildName, buildNumber)
+		return biErr == nil && found
+	}, 30*time.Second, 2*time.Second)
+
+	serviceManager, err := utils.CreateServiceManager(serverDetails, 3, 1000, false)
+	require.NoError(t, err)
+
+	count := tests.ValidateLocalGitVcsPropsOnBuildInfoArtifacts(t, serviceManager, publishedBuildInfo, tests.GradleRepo,
+		tests.VcsFixtureMainURL, tests.VcsFixtureMainRevision, tests.VcsFixtureMainBranch)
+	assert.Greater(t, count, 0)
+
+	cleanGradleTest(t)
+}

maven_test.go

@@ -839,3 +839,50 @@ func TestMavenBuildPublishWithCIVcsProps(t *testing.T) {
 
 	cleanMavenTest(t)
 }
+
+// TestMavenBuildPublishWithLocalGitVcsProps verifies local git VCS props on Maven artifacts
+// when running build-publish with VCS collection enabled and no CI env.
+func TestMavenBuildPublishWithLocalGitVcsProps(t *testing.T) {
+	initMavenTest(t, false)
+	buildName := tests.MvnBuildName + "-local-git"
+	buildNumber := "1"
+
+	cleanupEnv := tests.SetupLocalGitVcsEnv(t)
+	defer cleanupEnv()
+
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+	defer inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+
+	pomDir := createSimpleMavenProject(t)
+	tests.CopyGitFixtureIntoProject(t, pomDir)
+	require.FileExists(t, filepath.Join(pomDir, ".git", "HEAD"))
+
+	configFilePath := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "buildspecs", tests.MavenConfig)
+	destPath := filepath.Join(pomDir, ".jfrog", "projects")
+	createConfigFile(destPath, configFilePath, t)
+	require.NoError(t, os.Rename(filepath.Join(destPath, tests.MavenConfig), filepath.Join(destPath, "maven.yaml")))
+
+	oldHomeDir := changeWD(t, pomDir)
+	defer clientTestUtils.ChangeDirAndAssert(t, oldHomeDir)
+
+	repoLocalSystemProp := localRepoSystemProperty + localRepoDir
+	args := []string{"mvn", "clean", "install", "-B", repoLocalSystemProp,
+		"--build-name=" + buildName, "--build-number=" + buildNumber}
+	require.NoError(t, runJfrogCliWithoutAssertion(args...))
+
+	// Must run build-publish from project dir so GetLocalGitVcsInfo finds the fixture .git
+	runRt(t, "build-publish", buildName, buildNumber)
+
+	publishedBuildInfo, found, err := tests.GetBuildInfo(serverDetails, buildName, buildNumber)
+	require.NoError(t, err)
+	require.True(t, found, "Build info was not found")
+
+	serviceManager, err := utils.CreateServiceManager(serverDetails, 3, 1000, false)
+	require.NoError(t, err)
+
+	count := tests.ValidateLocalGitVcsPropsOnBuildInfoArtifacts(t, serviceManager, publishedBuildInfo, tests.MvnRepo1,
+		tests.VcsFixtureMainURL, tests.VcsFixtureMainRevision, tests.VcsFixtureMainBranch)
+	assert.Greater(t, count, 0)
+
+	cleanMavenTest(t)
+}