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
f8cf015d
Commit
f8cf015d
authored
Mar 08, 2018
by
kalvin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tools 增加新deploy方式
parent
c074f84d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
12 deletions
+29
-12
StageBucket.groovy
src/org/qg/tools/StageBucket.groovy
+28
-11
qgToolsPipeline.groovy
vars/qgToolsPipeline.groovy
+1
-1
No files found.
src/org/qg/tools/StageBucket.groovy
View file @
f8cf015d
...
@@ -47,18 +47,16 @@ def dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, conte
...
@@ -47,18 +47,16 @@ def dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, conte
return
imageTag
return
imageTag
}
}
def
deploy
(
namespace
,
systemName
,
imageTag
,
tier
)
{
def
deploy
(
namespace
,
systemName
,
imageTag
,
tier
,
isDeploy
)
{
def
deploy_job_info
def
deploy_job_info
_utils
().
beautyEcho
(
"将镜像更新到到Namespace:"
+
namespace
,
"info"
)
if
(
isDeploy
==
"true"
)
{
deploy_job_info
=
build
job:
'3.deployer.Updater'
,
parameters:
[
_utils
().
beautyEcho
(
"[新集群][deploy]将镜像更新到到Namespace:"
+
namespace
,
"info"
)
string
(
name:
'namespace'
,
value:
namespace
),
log
=
update_microservice
(
namespace
,
systemName
,
imageTag
,
tier
)
string
(
name:
'name'
,
value:
"${systemName}"
),
return
log
string
(
name:
'image'
,
value:
"${imageTag}"
),
}
else
{
string
(
name:
'tier'
,
value:
"tools"
)]
_utils
().
beautyEcho
(
"namespace:[${namespace}]不存在,不执行deploy"
,
"info"
)
}
log
=
Jenkins
.
getInstance
().
getItemByFullName
(
'3.deployer.Updater'
).
getBuildByNumber
(
deploy_job_info
.
getNumber
()).
logFile
.
text
return
log
}
}
def
clean_images
(
imageTag
)
{
def
clean_images
(
imageTag
)
{
...
@@ -68,4 +66,23 @@ def clean_images(imageTag) {
...
@@ -68,4 +66,23 @@ def clean_images(imageTag) {
@NonCPS
@NonCPS
def
jsonParse
(
def
json
)
{
def
jsonParse
(
def
json
)
{
new
groovy
.
json
.
JsonSlurperClassic
().
parseText
(
json
)
new
groovy
.
json
.
JsonSlurperClassic
().
parseText
(
json
)
}
}
\ No newline at end of file
def
update_microservice
(
namespace
,
name
,
image
,
tier
)
{
dest_url
=
"http://192.168.6.13/api/qahome/update_microservice"
response
=
httpRequest
httpMode:
"PUT"
,
consoleLogResponseBody:
true
,
contentType:
"APPLICATION_JSON"
,
requestBody:
"""{
"namespace":"${namespace}",
"name":"${name}",
"image":"${image}",
"tier":"${tier}"
}"""
,
url:
dest_url
def
res_json
=
jsonParse
(
response
.
content
)
return
res_json
}
vars/qgToolsPipeline.groovy
View file @
f8cf015d
...
@@ -79,7 +79,7 @@ def call(body) {
...
@@ -79,7 +79,7 @@ def call(body) {
stage
(
'Deploy To K8s Cluster'
)
{
stage
(
'Deploy To K8s Cluster'
)
{
_utils
.
beautyEcho
(
"Deploy To K8s Cluster"
,
"stage"
)
_utils
.
beautyEcho
(
"Deploy To K8s Cluster"
,
"stage"
)
def
deploy_log
=
_stage
.
deploy
V2
(
namespace
,
systemName
,
imageTag
,
config
.
tier
)
def
deploy_log
=
_stage
.
deploy
(
namespace
,
systemName
,
imageTag
,
config
.
tier
)
_utils
.
beautyEcho
(
deploy_log
,
"info"
)
_utils
.
beautyEcho
(
deploy_log
,
"info"
)
}
}
...
...
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