提交 7a9a8f80 编写于 作者: C colynn.liu

🐞 fix: add podName for ci-pod

 jenkins k8s pipeline yaml add the defined of podname
上级 91a8f4b5
......@@ -37,11 +37,12 @@ require (
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/drone/go-scm v1.20.0
github.com/ghodss/yaml v1.0.0
github.com/go-atomci/workflow v0.0.0-20220613022903-d67d3a46ad6a
github.com/go-atomci/workflow v1.0.2
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
github.com/go-sql-driver/mysql v1.6.0
github.com/gorilla/websocket v1.4.2
github.com/isbrick/tools v0.0.0-20211027093338-a3a0ded37175
github.com/jarcoal/httpmock v1.2.0
github.com/pborman/uuid v1.2.0
github.com/stretchr/testify v1.7.0
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
......@@ -67,7 +68,6 @@ require (
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/isbrick/http-client v0.0.0-20210321135403-0a5df00fdb84 // indirect
github.com/jarcoal/httpmock v1.2.0 // indirect
github.com/json-iterator/go v1.1.8 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
......
......@@ -187,8 +187,8 @@ github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0
github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
github.com/go-asn1-ber/asn1-ber v1.5.0 h1:/S4hO/AO6tLMlPX0oftGSOcdGJJN/MuYzfgWRMn199E=
github.com/go-asn1-ber/asn1-ber v1.5.0/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
github.com/go-atomci/workflow v0.0.0-20220613022903-d67d3a46ad6a h1:zmzsg95h8VPCSD7iWsTy/2/PFz7SeWVrkIPhVYhNfeY=
github.com/go-atomci/workflow v0.0.0-20220613022903-d67d3a46ad6a/go.mod h1:U396Nlydy0L3cVrlkdqp2DLn8e4DtwN+wJ+nmWIaS0s=
github.com/go-atomci/workflow v1.0.2 h1:IGcSE5F36hWDP8Xx1zEKcwMGu7fKwWKy9wJBCIfQ4y8=
github.com/go-atomci/workflow v1.0.2/go.mod h1:U396Nlydy0L3cVrlkdqp2DLn8e4DtwN+wJ+nmWIaS0s=
github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
......@@ -393,6 +393,8 @@ github.com/isbrick/http-client v0.0.0-20210321135403-0a5df00fdb84 h1:f+X6/PyYYWQ
github.com/isbrick/http-client v0.0.0-20210321135403-0a5df00fdb84/go.mod h1:ILI7SGUToE8ebBaVw9+tdlWlj2naGFmnMU+FrQj+6ro=
github.com/isbrick/tools v0.0.0-20211027093338-a3a0ded37175 h1:HnZgYkC7M0z/0Ll+qXQS2jizZgWjSkC90j6HDmr/SuM=
github.com/isbrick/tools v0.0.0-20211027093338-a3a0ded37175/go.mod h1:3jxvSrtFqeDL15wHztv4lLjQqB1YiPU3jAewh3LwUW0=
github.com/jarcoal/httpmock v1.2.0 h1:gSvTxxFR/MEMfsGrvRbdfpRUMBStovlSRLw0Ep1bwwc=
github.com/jarcoal/httpmock v1.2.0/go.mod h1:oCoTsnAz4+UoOUIf5lJOWV2QQIW5UoeUI6aM2YnWAZk=
github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
......@@ -480,6 +482,7 @@ github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK86
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/maxatome/go-testdeep v1.11.0 h1:Tgh5efyCYyJFGUYiT0qxBSIDeXw0F5zSoatlou685kk=
github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
......
......@@ -411,6 +411,7 @@ func (pm *PipelineManager) CreateBuildJob(creator string, projectID, publishID i
Stages: pipelineStagesStr,
CommonContext: jenkins.CommonContext{
Namespace: CIInfo[4],
PodName: strings.ReplaceAll(jobName, "_", "-"),
},
CallBack: jenkins.CallbackRequest{
Token: adminToken,
......@@ -557,6 +558,7 @@ func (pm *PipelineManager) CreateDeployJob(creator string, projectID, publishID
},
CommonContext: jenkins.CommonContext{
Namespace: CIInfo[4],
PodName: strings.ReplaceAll(jobName, "_", "-"),
},
}
......
......@@ -57,7 +57,8 @@ func NewPublishManager() *PublishManager {
// CreatePublish ...
func (pm *PublishManager) CreatePublish(user string, projectID int64, p *PublishReq) error {
if err := pm.publishCreateParamVerify(p); err != nil {
return err
log.Log.Error("args verify failed: %v", err.Error())
return fmt.Errorf("app args verify failed, please check app url/branch info, err: %v", err.Error())
}
firstStageID, firstStageName, step, stepType, err := pm.projectHandler.GetStageStepInfo(p.BindPipelineID)
if err != nil {
......@@ -96,6 +97,7 @@ func (pm *PublishManager) CreatePublish(user string, projectID int64, p *Publish
if pipelineInstanceID, err := pm.createPipelineInstance(p.BindPipelineID, publishID, user); err == nil {
publishModel, err := pm.model.GetPublishByID(publishID)
if err != nil {
log.Log.Error("get publishby id error: %s", err.Error())
return err
}
publishModel.LastPipelineInstanceID = pipelineInstanceID
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册