Skip to content

Removed aux repos #734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albertpuente wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Removed aux repos #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b911802
removed aux repos
Apr 19, 2022
ff33a48
typo
Apr 19, 2022
b9c74fe
typo and remove test
Apr 19, 2022
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
10 changes: 6 additions & 4 deletions src/main/java/org/opendevstack/provision/controller/ProjectApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ private OpenProjectData createDeliveryChain(OpenProjectData project) throws IOEx
}

// create auxilaries - for design and for the ocp artifacts
String[] auxiliaryRepositories = {"occonfig-artifacts", "design"};
String[] auxiliaryRepositories = {}; // formerly {"occonfig-artifacts", "design"};

if (project.getScmvcsUrl() == null) {
// create the bugtracker project
Expand All @@ -542,9 +542,11 @@ private OpenProjectData createDeliveryChain(OpenProjectData project) throws IOEx
Preconditions.checkNotNull(
project.getScmvcsUrl(), bitbucketAdapter.getClass() + " did not return scmvcs url");

project.setRepositories(
bitbucketAdapter.createAuxiliaryRepositoriesForODSProject(
project, auxiliaryRepositories));
if (!auxiliaryRepositories.isEmpty()) {
project.setRepositories(
bitbucketAdapter.createAuxiliaryRepositoriesForODSProject(
project, auxiliaryRepositories));
}

// provision platform projects
project = jenkinsPipelineAdapter.createPlatformProjects(project);
Expand Down
6 changes: 0 additions & 6 deletions src/test/java/org/opendevstack/provision/storage/LocalStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@ public void upgradeExisting() throws Exception {
Map<String, Map<URL_TYPE, String>> repositories = project.getRepositories();

assertNotNull(repositories);
Map<URL_TYPE, String> occonfigrepo = repositories.get("odsew-occonfig-artifacts");

assertNotNull(occonfigrepo);

assertEquals(3, occonfigrepo.size());

assertEquals(currentPath, project.getPhysicalLocation());
} catch (Exception allErr) {
throw allErr;
Expand Down
29 changes: 1 addition & 28 deletions src/test/resources/20170101000000-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,5 @@

"key" : "TEST"
,
"repositories" : {
"odsew-design" : {
"clone" : [ {
"name" : "http",
"href" : "https://bb/scm/odsew/odsew-design.git"
}, {
"name" : "ssh",
"href" : "ssh://git@bb:7999/odsew/odsew-design.git"
} ],
"self" : [ {
"name" : null,
"href" : "https://bb/projects/ODSEW/repos/odsew-design/browse"
} ]
},
"odsew-occonfig-artifacts" : {
"clone" : [ {
"name" : "ssh",
"href" : "ssh://git@bb:7999/odsew/odsew-occonfig-artifacts.git"
}, {
"name" : "http",
"href" : "https://bb/scm/odsew/odsew-occonfig-artifacts.git"
} ],
"self" : [ {
"name" : null,
"href" : "https://bb/projects/ODSEW/repos/odsew-occonfig-artifacts/browse"
} ]
}
}
"repositories" : {}
}