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
6acb99d7
Commit
6acb99d7
authored
Jan 17, 2019
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tag name tkeCode
parent
3116f431
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
StageBucketTke.groovy
src/org/qg/docker_new/StageBucketTke.groovy
+6
-2
qgDockerPiplineWithDockerSlaveTke.groovy
vars/qgDockerPiplineWithDockerSlaveTke.groovy
+1
-1
No files found.
src/org/qg/docker_new/StageBucketTke.groovy
View file @
6acb99d7
...
...
@@ -18,10 +18,14 @@ def contextMkdir(key) {
return
contextDir
}
def
imageTag
(
harborGroup
,
k8sSystemName
,
safeBranchName
,
tagName
){
def
imageTag
(
harborGroup
,
k8sSystemName
,
safeBranchName
,
tagName
,
imageType
){
def
imageTag4_4
=[:]
imageTag4_4
[
"harborHost"
]=
"http://192.168.4.4"
imageTag4_4
[
"imageTag"
]
=
"192.168.4.4/${harborGroup}/${k8sSystemName}:tke-${safeBranchName}-${tagName}"
if
(
imageType
==
"test"
){
imageTag4_4
[
"imageTag"
]
=
"192.168.4.4/${harborGroup}/${k8sSystemName}:tke${safeBranchName}-${tagName}"
}
else
{
imageTag4_4
[
"imageTag"
]
=
"192.168.4.4/${harborGroup}/${k8sSystemName}:tkeCode${safeBranchName}-${tagName}"
}
return
[
imageTag4_4
]
}
...
...
vars/qgDockerPiplineWithDockerSlaveTke.groovy
View file @
6acb99d7
...
...
@@ -83,7 +83,7 @@ def call(body) {
def
k8sSystemName
=
originSystemName
.
replaceAll
(
"_"
,
"-"
).
toLowerCase
()
def
safeBranchName
=
originBranchName
.
replaceAll
(
regex
,
"_"
).
toLowerCase
()
imageTagInfos
=
_stage
.
imageTag
(
harborGroup
,
k8sSystemName
,
safeBranchName
,
timeStemp
)
imageTagInfos
=
_stage
.
imageTag
(
harborGroup
,
k8sSystemName
,
safeBranchName
,
timeStemp
,
imageType
)
for
(
imageTagInfo
in
imageTagInfos
){
_stage
.
dockerbuild_and_push
(
imageTagInfo
,
buildNumber
,
originSystemName
,
originBranchName
,
cluster
,
timeStemp
,
contextDir
,
branchHashCode
)
...
...
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