a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

directrunstart: use new user create run api 

* Push the local custom ref to a branch ref (refs/heads/branch)
* After the push create the run calling the user create run api
This commit is contained in:
Simone Gotti 2019-06-11 15:15:14 +02:00
parent 2a95c93f0d
commit a27721c5b1
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/agola/cmd/directrunstart.go
View File

@ -17,6 +17,7 @@ package cmd
import ( import (
"context" "context"
"fmt" "fmt"
"path"
gitsave "github.com/sorintlab/agola/internal/git-save" gitsave "github.com/sorintlab/agola/internal/git-save"
"github.com/sorintlab/agola/internal/services/gateway/api" "github.com/sorintlab/agola/internal/services/gateway/api"
@ -65,7 +66,7 @@ func directRunStart(cmd *cobra.Command, args []string) error {
user, _, err := gwclient.GetCurrentUser(context.TODO()) user, _, err := gwclient.GetCurrentUser(context.TODO())
if err != nil { if err != nil {
log.Fatalf("err: %v", err) return err
} }
// setup unique local git repo uuid // setup unique local git repo uuid
@ -74,7 +75,7 @@ func directRunStart(cmd *cobra.Command, args []string) error {
if repoUUID == "" { if repoUUID == "" {
repoUUID = uuid.NewV4().String() repoUUID = uuid.NewV4().String()
if _, err := git.ConfigSet(context.Background(), "agola.repouuid", repoUUID); err != nil { if _, err := git.ConfigSet(context.Background(), "agola.repouuid", repoUUID); err != nil {
log.Fatalf("failed to set agola repo uid in git config: %v", err) return fmt.Errorf("failed to set agola repo uid in git config: %v", err)
} }
} }
@ -84,14 +85,30 @@ func directRunStart(cmd *cobra.Command, args []string) error {
}) })
branch := "gitsavebranch-" + uuid.NewV4().String() branch := "gitsavebranch-" + uuid.NewV4().String()
message := "agola direct run"
if _, err := gs.Save("agola direct run", branch); err != nil { commitSHA, err := gs.Save(message, branch)
log.Fatalf("err: %v", err) if err != nil {
return err
} }
log.Infof("pushing branch") log.Infof("pushing branch")
repoPath := fmt.Sprintf("%s/%s", user.ID, repoUUID)
repoURL := fmt.Sprintf("%s/repos/%s/%s.git", gatewayURL, user.ID, repoUUID) repoURL := fmt.Sprintf("%s/repos/%s/%s.git", gatewayURL, user.ID, repoUUID)
if err := gitsave.GitPush("", repoURL, "refs/gitsave/"+branch); err != nil {
// push to a branch with default branch refs "refs/heads/branch"
if err := gitsave.GitPush("", repoURL, fmt.Sprintf("%s:refs/heads/%s", path.Join(gs.RefsPrefix(), branch), branch)); err != nil {
return err
}
log.Infof("starting direct run")
req := &api.UserCreateRunRequest{
RepoPath: repoPath,
Branch: branch,
CommitSHA: commitSHA,
Message: message,
}
if _, err := gwclient.UserCreateRun(context.TODO(), req); err != nil {
return err return err
} }