Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ go test -v github.com/jfrog/jfrog-cli -test.gradle [flags]
##### Requirements

- Make sure the `RTLIC` environment variable is configured with a valid license.
- You can start an Artifactory container by running the `startArtifactory.sh` script located in the `testdata/docker/artifactory` directory. Before running the tests, wait for Artifactory to finish booting up in the container.
- You can start an Artifactory container by running the `start.sh` script located in the `testdata/docker/artifactory` directory. Before running the tests, wait for Artifactory to finish booting up in the container.

| Flag | Description |
| ------------------------- | ----------------------------------- |
Expand Down
7 changes: 4 additions & 3 deletions ghostfrog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,11 @@ func TestGhostFrogHighFanOutStress(t *testing.T) {
// E2E-030: setup-jfrog-cli native integration
func TestGhostFrogSetupJFrogCLINativeIntegration(t *testing.T) {
homeDir := initGhostFrogTest(t)
installAliases(t, "npm,mvn,go,pip")
tools := []string{"npm", "mvn", "go", "pip", "helm"}
installAliases(t, strings.Join(tools, ","))

binDir := aliasBinDir(homeDir)
for _, tool := range []string{"npm", "mvn", "go", "pip"} {
for _, tool := range tools {
_, err := os.Stat(aliasToolPath(homeDir, tool))
require.NoError(t, err, "alias for %s should exist", tool)
}
Expand All @@ -484,7 +485,7 @@ func TestGhostFrogSetupJFrogCLINativeIntegration(t *testing.T) {
// Verify alias dir is populated
entries, err := os.ReadDir(binDir)
require.NoError(t, err)
assert.GreaterOrEqual(t, len(entries), 4, "should have at least 4 alias entries")
assert.GreaterOrEqual(t, len(entries), len(tools), fmt.Sprintf("should have at least %d alias entries", len(tools)))
}

// E2E-031: Auto build-info publish (requires Artifactory)
Expand Down
5 changes: 5 additions & 0 deletions helm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,14 @@ func TestHelmPackageWithBuildInfo(t *testing.T) {
err = helmCmd.Run()
require.NoError(t, err, "helm dependency update should succeed")

chartArchiveDestinationDir := filepath.Join(chartDir, "target")
err = os.MkdirAll(chartArchiveDestinationDir, 0o755)
require.NoError(t, err, "Unable to create target directory for chart archive")

jfrogCli := coreTests.NewJfrogCli(execMain, "jfrog", "")
args := []string{
"helm", "package", ".",
"--destination", chartArchiveDestinationDir,
"--build-name=" + buildName,
"--build-number=" + buildNumber,
}
Expand Down
1 change: 1 addition & 0 deletions packagealias/packagealias.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var SupportedTools = []string{
"docker",
"gem",
"bundle",
"helm",
}

// AliasMode represents how a tool should be handled
Expand Down
Loading