diff --git a/src/main/java/org/opendevstack/provision/controller/ProjectApiController.java b/src/main/java/org/opendevstack/provision/controller/ProjectApiController.java index 7eeca554..c4ada2ea 100644 --- a/src/main/java/org/opendevstack/provision/controller/ProjectApiController.java +++ b/src/main/java/org/opendevstack/provision/controller/ProjectApiController.java @@ -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 @@ -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); diff --git a/src/test/java/org/opendevstack/provision/storage/LocalStorageTest.java b/src/test/java/org/opendevstack/provision/storage/LocalStorageTest.java index 05d706ff..f49e96f3 100644 --- a/src/test/java/org/opendevstack/provision/storage/LocalStorageTest.java +++ b/src/test/java/org/opendevstack/provision/storage/LocalStorageTest.java @@ -77,12 +77,6 @@ public void upgradeExisting() throws Exception { Map> repositories = project.getRepositories(); assertNotNull(repositories); - Map occonfigrepo = repositories.get("odsew-occonfig-artifacts"); - - assertNotNull(occonfigrepo); - - assertEquals(3, occonfigrepo.size()); - assertEquals(currentPath, project.getPhysicalLocation()); } catch (Exception allErr) { throw allErr; diff --git a/src/test/resources/20170101000000-test.txt b/src/test/resources/20170101000000-test.txt index 83106712..f3fe61fd 100644 --- a/src/test/resources/20170101000000-test.txt +++ b/src/test/resources/20170101000000-test.txt @@ -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" : {} } \ No newline at end of file