fix(api): run workflow from repository must keep repository fullname (#…

…2973)
ovh · Jun 29, 2018 · 9ae5c41 · 9ae5c41
1 parent 8ce66f2
commit 9ae5c41
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/engine/api/api_test.go b/engine/api/api_test.go
@@ -47,6 +47,5 @@ func newTestServer(t *testing.T, bootstrapFunc ...test.Bootstrapf) (*API, string
 	api.InitRouter()
 	ts := httptest.NewServer(router.Mux)
 	url, _ := url.Parse(ts.URL)
-	url.Path = url.Path
 	return api, url.String(), ts.Close
 }
diff --git a/engine/api/workflow/repository.go b/engine/api/workflow/repository.go
@@ -77,7 +77,7 @@ func extractWorkflow(db *gorp.DbMap, store cache.Store, p *sdk.Project, w *sdk.W
 	}
 	opt := &PushOption{
 		VCSServer:          ope.VCSServer,
-		RepositoryName:     ope.RepositoryInfo.Name,
+		RepositoryName:     ope.RepoFullName,
 		RepositoryStrategy: ope.RepositoryStrategy,
 		Branch:             ope.Setup.Checkout.Branch,
 		FromRepository:     ope.RepositoryInfo.FetchURL,

diff --git a/engine/repositories/processor_checkout.go b/engine/repositories/processor_checkout.go
@@ -32,11 +32,6 @@ func (s *Service) processCheckout(op *sdk.Operation) error {
 		}
 	}
 
-	n, err := gitRepo.Name()
-	if err != nil {
-		log.Error("Repositories> processCheckout> gitRepo.Name> [%s] Error: %v", op.UUID, err)
-		return err
-	}
 	f, err := gitRepo.FetchURL()
 	if err != nil {
 		log.Error("Repositories> processCheckout> gitRepo.FetchURL> [%s] Error: %v", op.UUID, err)
@@ -49,7 +44,7 @@ func (s *Service) processCheckout(op *sdk.Operation) error {
 	}
 
 	op.RepositoryInfo = &sdk.OperationRepositoryInfo{
-		Name:          n,
+		Name:          op.RepoFullName,
 		FetchURL:      f,
 		DefaultBranch: d,
 	}