Skip to content

Commit 42df0af

Browse files
committed
proxy virtual repo to conancenter
1 parent c463e27 commit 42df0af

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

conan_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ func TestConanInstall(t *testing.T) {
4343
"--build-name=" + tests.ConanBuildName,
4444
"--build-number=" + buildNumber,
4545
}
46-
assert.NoError(t, jfrogCli.Exec(args...))
46+
require.NoError(t, jfrogCli.Exec(args...))
4747

4848
// Publish build info
49-
assert.NoError(t, artifactoryCli.Exec("bp", tests.ConanBuildName, buildNumber))
49+
require.NoError(t, artifactoryCli.Exec("bp", tests.ConanBuildName, buildNumber))
5050
defer inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.ConanBuildName, artHttpDetails)
5151

5252
// Validate build info
@@ -55,7 +55,7 @@ func TestConanInstall(t *testing.T) {
5555
require.True(t, found, "build info was expected to be found")
5656

5757
buildInfoModules := publishedBuildInfo.BuildInfo.Modules
58-
assert.Len(t, buildInfoModules, 1, "Expected 1 module")
58+
require.Len(t, buildInfoModules, 1, "Expected 1 module")
5959
assert.Equal(t, buildinfo.Conan, buildInfoModules[0].Type, "Module type should be conan")
6060

6161
// Should have dependencies (at least zlib)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
2-
"key": "cli-conan-local",
2+
"key": "${CONAN_LOCAL_REPO}",
33
"rclass": "local",
44
"packageType": "conan"
55
}
6-
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
2-
"key": "cli-conan-remote",
2+
"key": "${CONAN_REMOTE_REPO}",
33
"rclass": "remote",
44
"packageType": "conan",
55
"url": "https://center2.conan.io"
66
}
7-
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
2-
"key": "cli-conan-virtual",
2+
"key": "${CONAN_VIRTUAL_REPO}",
33
"rclass": "virtual",
44
"packageType": "conan",
5-
"repositories": ["cli-conan-local", "cli-conan-remote"]
5+
"repositories": ["${CONAN_LOCAL_REPO}", "${CONAN_REMOTE_REPO}"]
66
}
7-

utils/tests/utils.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,9 @@ func getSubstitutionMap() map[string]string {
476476
"${POETRY_LOCAL_REPO}": PoetryLocalRepo,
477477
"${POETRY_REMOTE_REPO}": PoetryRemoteRepo,
478478
"${POETRY_VIRTUAL_REPO}": PoetryVirtualRepo,
479+
"${CONAN_LOCAL_REPO}": ConanLocalRepo,
480+
"${CONAN_REMOTE_REPO}": ConanRemoteRepo,
481+
"${CONAN_VIRTUAL_REPO}": ConanVirtualRepo,
479482
"${HELM_REPO}": HelmLocalRepo,
480483
"${BUILD_NAME1}": RtBuildName1,
481484
"${BUILD_NAME2}": RtBuildName2,

0 commit comments

Comments
 (0)