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
f730ee0e
Commit
f730ee0e
authored
Apr 16, 2018
by
wentao.suo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
8631c632
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
StageBucket.groovy
src/org/qg/docker_new/StageBucket.groovy
+3
-1
qgDockerPiplineWithDockerSlave.groovy
vars/qgDockerPiplineWithDockerSlave.groovy
+1
-1
No files found.
src/org/qg/docker_new/StageBucket.groovy
View file @
f730ee0e
...
...
@@ -24,6 +24,7 @@ def imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp){
def
imageTag4_4
=[:]
imageTag4_36
[
"harborHost"
]=
"http://192.168.4.36"
imageTag4_36
[
"imageTag"
]
=
"192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
imageTag4_4
[
"harborHost"
]=
"http://192.168.4.4"
imageTag4_4
[
"imageTag"
]
=
"192.168.4.4/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
...
...
@@ -430,8 +431,9 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
def
deploy
(
namespace
,
systemName
,
imageTag
,
tier
,
isDeploy
)
{
stage
(
'Deploy To K8s Cluster'
){
_utils
().
beautyEcho
(
"Deploy To K8s Cluster image: ${imageTag} to:${namespace}"
,
"info"
)
def
deploy_job_info
if
(
isDeploy
==
"true"
)
{
_utils
().
beautyEcho
(
"[新集群][deployV2]将镜像更新到到Namespace:"
+
namespace
,
"info"
)
update_microservice
(
namespace
,
systemName
,
imageTag
,
tier
)
...
...
vars/qgDockerPiplineWithDockerSlave.groovy
View file @
f730ee0e
...
...
@@ -79,7 +79,7 @@ def call(body) {
_stage
.
dockerbuild_and_push
(
imageTagInfo
,
buildNumber
,
_systemName
,
originBranchName
,
cluster
,
timeStemp
,
contextDir
)
_utils
.
beautyEcho
(
"Deploy To K8s Cluster image: ${imageTag} to:${namespace}"
,
"stage"
)
}
_stage
.
deploy
(
namespace
,
_systemName
,
imageTagInfos
[
0
][
"imageTag"
],
config
.
tier
,
isDeploy
)
...
...
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