admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix checkpipeline

Browse Source 
Signed-off-by: soulseen <sunzhu@yunify.com>
This commit is contained in:
soulseen
2019-07-04 20:16:09 +08:00
parent d30dba899d
commit dde017c4ea
4 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/models/devops/devops.go
View File

@@ -18,6 +18,7 @@
package devops
import (
"bytes"
"compress/gzip"
"encoding/json"
"fmt"
@@ -293,10 +294,16 @@ func GetPipeBranch(projectName, pipelineName string, req *http.Request) ([]byte,
return res, err
}
func CheckBranchPipeline(projectName, pipelineName, branchName, runId, nodeId, stepId string, req *http.Request) ([]byte, error) {
func SubmitBranchInputStep(projectName, pipelineName, branchName, runId, nodeId, stepId string, req *http.Request) ([]byte, error) {
baseUrl := fmt.Sprintf(jenkins.Server+CheckBranchPipelineUrl+req.URL.RawQuery, projectName, pipelineName, branchName, runId, nodeId, stepId)
log.Info("Jenkins-url: " + baseUrl)
newBody, err := getInputReqBody(req.Body)
if err != nil {
log.Error(err)
return nil, err
}
req.Body = newBody
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
@@ -306,10 +313,16 @@ func CheckBranchPipeline(projectName, pipelineName, branchName, runId, nodeId, s
return resBody, err
}
func CheckPipeline(projectName, pipelineName, runId, nodeId, stepId string, req *http.Request) ([]byte, error) {
func SubmitInputStep(projectName, pipelineName, runId, nodeId, stepId string, req *http.Request) ([]byte, error) {
baseUrl := fmt.Sprintf(jenkins.Server+CheckPipelineUrl+req.URL.RawQuery, projectName, pipelineName, runId, nodeId, stepId)
log.Info("Jenkins-url: " + baseUrl)
newBody, err := getInputReqBody(req.Body)
if err != nil {
log.Error(err)
return nil, err
}
req.Body = newBody
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
@@ -319,6 +332,45 @@ func CheckPipeline(projectName, pipelineName, runId, nodeId, stepId string, req
return resBody, err
}
func getInputReqBody(reqBody io.ReadCloser) (newReqBody io.ReadCloser, err error) {
var checkBody CheckPlayload
var jsonBody []byte
var workRound struct {
ID string `json:"id,omitempty" description:"id"`
Parameters []CheckPlayloadParameters `json:"parameters"`
Abort bool `json:"abort,omitempty" description:"abort or not"`
}
Body, err := ioutil.ReadAll(reqBody)
if err != nil {
log.Error(err)
return nil, err
}
err = json.Unmarshal(Body, &checkBody)
if checkBody.Abort != true && checkBody.Parameters == nil {
workRound.Parameters = []CheckPlayloadParameters{}
workRound.ID = checkBody.ID
jsonBody, _ = json.Marshal(workRound)
} else {
jsonBody, _ = json.Marshal(checkBody)
}
newReqBody = parseBody(bytes.NewBuffer(jsonBody))
return newReqBody, nil
}
func parseBody(body io.Reader) (newReqBody io.ReadCloser) {
rc, ok := body.(io.ReadCloser)
if !ok && body != nil {
rc = ioutil.NopCloser(body)
}
return rc
}
func GetConsoleLog(projectName, pipelineName string, req *http.Request) ([]byte, error) {
baseUrl := fmt.Sprintf(jenkins.Server+GetConsoleLogUrl+req.URL.RawQuery, projectName, pipelineName)
log.Info("Jenkins-url: " + baseUrl)

14
pkg/models/devops/json.go
View File

@@ -716,12 +716,14 @@ type NodeStatus struct {
// CheckPipeline
type CheckPlayload struct {
ID string `json:"id,omitempty" description:"id"`
Parameters []struct {
Name string `json:"name,omitempty" description:"name"`
Value string `json:"value,omitempty" description:"value"`
} `json:"parameters,omitempty"`
Abort bool `json:"abort,omitempty" description:"abort or not"`
ID string `json:"id,omitempty" description:"id"`
Parameters []CheckPlayloadParameters `json:"parameters,omitempty"`
Abort bool `json:"abort,omitempty" description:"abort or not"`
}
type CheckPlayloadParameters struct {
Name string `json:"name,omitempty" description:"name"`
Value string `json:"value,omitempty" description:"value"`
}
// Getcrumb