Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2020fengziyang
kubesphere
提交
039dbf80
K
kubesphere
项目概览
2020fengziyang
/
kubesphere
与 Fork 源项目一致
Fork自
KubeSphere / kubesphere
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kubesphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
039dbf80
编写于
12月 01, 2020
作者:
LinuxSuRen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the inapproprite errors handle with cron expression checking
Signed-off-by:
rick
<
rick@jenkins-zh.cn
>
上级
c5de21af
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
48 addition
and
21 deletion
+48
-21
pkg/simple/client/devops/jenkins/jenkins.go
pkg/simple/client/devops/jenkins/jenkins.go
+7
-2
pkg/simple/client/devops/jenkins/pipeline.go
pkg/simple/client/devops/jenkins/pipeline.go
+41
-19
未找到文件。
pkg/simple/client/devops/jenkins/jenkins.go
浏览文件 @
039dbf80
...
...
@@ -25,6 +25,7 @@ import (
"kubesphere.io/kubesphere/pkg/simple/client/devops"
"log"
"net/http"
"net/url"
"os"
"reflect"
"strconv"
...
...
@@ -841,10 +842,14 @@ func (j *Jenkins) CheckCron(projectName string, httpParameters *devops.HttpParam
return
nil
,
err
}
query
:=
url
.
Values
{
"value"
:
[]
string
{
cron
.
Cron
},
}
if
cron
.
PipelineName
!=
""
{
path
=
fmt
.
Sprintf
(
CheckPipelienCronUrl
,
projectName
,
cron
.
PipelineName
,
cron
.
Cron
)
path
=
fmt
.
Sprintf
(
CheckPipelienCronUrl
,
projectName
,
cron
.
PipelineName
,
query
.
Encode
()
)
}
else
{
path
=
fmt
.
Sprintf
(
CheckCronUrl
,
projectName
,
cron
.
Cron
)
path
=
fmt
.
Sprintf
(
CheckCronUrl
,
projectName
,
query
.
Encode
()
)
}
PipelineOjb
:=
&
Pipeline
{
...
...
pkg/simple/client/devops/jenkins/pipeline.go
浏览文件 @
039dbf80
...
...
@@ -17,6 +17,7 @@ limitations under the License.
package
jenkins
import
(
"bytes"
"encoding/json"
"github.com/PuerkitoBio/goquery"
"k8s.io/klog"
...
...
@@ -73,8 +74,8 @@ const (
GithubWebhookUrl
=
"/github-webhook/"
CheckScriptCompileUrl
=
"/job/%s/job/%s/descriptorByName/org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition/checkScriptCompile"
CheckPipelienCronUrl
=
"/job/%s/job/%s/descriptorByName/hudson.triggers.TimerTrigger/checkSpec?
value=
%s"
CheckCronUrl
=
"/job/%s/descriptorByName/hudson.triggers.TimerTrigger/checkSpec?
value=
%s"
CheckPipelienCronUrl
=
"/job/%s/job/%s/descriptorByName/hudson.triggers.TimerTrigger/checkSpec?%s"
CheckCronUrl
=
"/job/%s/descriptorByName/hudson.triggers.TimerTrigger/checkSpec?%s"
ToJenkinsfileUrl
=
"/pipeline-model-converter/toJenkinsfile"
ToJsonUrl
=
"/pipeline-model-converter/toJson"
...
...
@@ -661,54 +662,75 @@ func (p *Pipeline) CheckScriptCompile() (*devops.CheckScript, error) {
}
func
(
p
*
Pipeline
)
CheckCron
()
(
*
devops
.
CheckCronRes
,
error
)
{
var
res
=
new
(
devops
.
CheckCronRes
)
Url
,
err
:=
url
.
Parse
(
p
.
Jenkins
.
Server
+
p
.
Path
)
cronServiceURL
,
err
:=
url
.
Parse
(
p
.
Jenkins
.
Server
+
p
.
Path
)
reqJenkins
:=
&
http
.
Request
{
Method
:
http
.
MethodGet
,
URL
:
Url
,
URL
:
cronServiceURL
,
Header
:
p
.
HttpParameters
.
Header
,
}
client
:=
&
http
.
Client
{
Timeout
:
30
*
time
.
Second
}
reqJenkins
.
SetBasicAuth
(
p
.
Jenkins
.
Requester
.
BasicAuth
.
Username
,
p
.
Jenkins
.
Requester
.
BasicAuth
.
Password
)
resp
,
err
:=
client
.
Do
(
reqJenkins
)
if
resp
!=
nil
&&
resp
.
StatusCode
!=
http
.
StatusOK
{
resBody
,
_
:=
getRespBody
(
resp
)
return
&
devops
.
CheckCronRes
{
Result
:
"error"
,
Message
:
string
(
resBody
),
},
err
}
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
return
interanlErrorMessage
()
,
err
}
defer
resp
.
Body
.
Close
()
doc
,
err
:=
goquery
.
NewDocumentFromReader
(
resp
.
Body
)
var
responseText
string
if
resp
!=
nil
{
responseData
,
_
:=
getRespBody
(
resp
)
responseText
=
string
(
responseData
)
defer
func
()
{
_
=
resp
.
Body
.
Close
()
}()
statusCode
:=
resp
.
StatusCode
if
statusCode
!=
http
.
StatusOK
&&
statusCode
!=
http
.
StatusBadRequest
{
// the response body is meaningless for the users, but it's useful for a contributor
klog
.
Errorf
(
"cron service from Jenkins is unavailable, error response: %v, status code: %d"
,
responseText
,
statusCode
)
return
interanlErrorMessage
(),
err
}
}
klog
.
Infof
(
"response text: %s"
,
responseText
)
doc
,
err
:=
goquery
.
NewDocumentFromReader
(
bytes
.
NewReader
([]
byte
(
responseText
)))
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
return
interanlErrorMessage
()
,
err
}
// it gives a message which located in <div>...</div> when the status code is 200
doc
.
Find
(
"div"
)
.
Each
(
func
(
i
int
,
selection
*
goquery
.
Selection
)
{
res
.
Message
=
selection
.
Text
()
res
.
Result
,
_
=
selection
.
Attr
(
"class"
)
})
// it gives a message which located in <pre>...</pre> when the status code is 400
doc
.
Find
(
"pre"
)
.
Each
(
func
(
i
int
,
selection
*
goquery
.
Selection
)
{
res
.
Message
=
selection
.
Text
()
res
.
Result
=
"error"
})
if
res
.
Result
==
"ok"
{
res
.
LastTime
,
res
.
NextTime
,
err
=
parseCronJobTime
(
res
.
Message
)
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
return
interanlErrorMessage
()
,
err
}
}
return
res
,
err
}
func
interanlErrorMessage
()
*
devops
.
CheckCronRes
{
return
&
devops
.
CheckCronRes
{
Result
:
"error"
,
Message
:
"internal errors happened, get more details by checking ks-apiserver log output"
,
}
}
func
parseCronJobTime
(
msg
string
)
(
string
,
string
,
error
)
{
times
:=
strings
.
Split
(
msg
,
";"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录