Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
global-jenkinsfile
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
global-jenkinsfile
Commits
61c85712
Commit
61c85712
authored
Sep 24, 2019
by
kewei.jia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 dingtalk参数
parent
b533857a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
StageBucketTke.groovy
src/org/qg/docker_new/StageBucketTke.groovy
+1
-1
qgDockerPiplineWithDockerSlaveTke.groovy
vars/qgDockerPiplineWithDockerSlaveTke.groovy
+2
-1
No files found.
src/org/qg/docker_new/StageBucketTke.groovy
View file @
61c85712
...
...
@@ -591,7 +591,7 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,timeStem
// set_image_info(systemName, branchHashCode, imageTag)
}
def
ding_talk_back
(
buildNumber
,
flags
,
image
,
cluster
,
tier
)
{
def
ding_talk_back
(
buildNumber
,
flags
,
image
,
cluster
,
tier
,
systemName
)
{
image
=
image
.
replaceAll
(
"ccr.ccs.tencentyun.com/"
,
""
)
def
projectAttr
=
project_attr
(
systemName
)
def
host
=
projectAttr
[
"host"
]
...
...
vars/qgDockerPiplineWithDockerSlaveTke.groovy
View file @
61c85712
...
...
@@ -80,7 +80,7 @@ def call(body) {
for
(
imageTagInfo
in
imageTagInfos
){
_stage
.
dockerbuild_and_push
(
imageTagInfo
,
buildNumber
,
originSystemName
,
originBranchName
,
timeStemp
,
contextDir
,
branchHashCode
,
config
.
buildType
)
}
_stage
.
deploy
(
namespace
,
originSystemName
,
imageTagInfos
[
0
][
"imageTag"
],
config
.
tier
,
isDeploy
,
cluster
)
_stage
.
deploy
(
namespace
,
originSystemName
,
imageTagInfos
[
0
][
"imageTag"
],
config
.
tier
,
isDeploy
,
cluster
,
originSystemName
)
}
/* 4 */
...
...
@@ -95,6 +95,7 @@ def call(body) {
}
catch
(
err
)
{
_utils
.
beautyEcho
(
err
,
"fail"
)
_stage
.
ding_talk
(
buildNumber
,
"fail"
)
_stage
.
deploy
(
namespace
,
originSystemName
,
imageTagInfos
[
0
][
"imageTag"
],
config
.
tier
,
isDeploy
,
cluster
,
originSystemName
)
if
(
imageTagInfos
!=
null
){
_stage
.
clean_images
(
imageTagInfos
[
0
][
"imageTag"
],
contextDir
,
config
.
buildType
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment