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
ba8504d6
Commit
ba8504d6
authored
Nov 14, 2017
by
daidekun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
systemName
parent
570654f6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
StageBucket.groovy
src/org/qg/StageBucket.groovy
+1
-1
qgDockerPipeline.groovy
vars/qgDockerPipeline.groovy
+1
-1
No files found.
src/org/qg/StageBucket.groovy
View file @
ba8504d6
...
@@ -15,7 +15,7 @@ def build(namespace, systemName, contextDir) {
...
@@ -15,7 +15,7 @@ def build(namespace, systemName, contextDir) {
sh
"ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e workspace=${contextDir} -vv"
sh
"ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e workspace=${contextDir} -vv"
}
}
def
docker_build_and_push
(
buildNumber
,
branchName
,
harborGroup
,
contextDir
)
{
def
docker_build_and_push
(
buildNumber
,
branchName
,
harborGroup
,
systemName
,
contextDir
)
{
/*分支名中非法字符统一替换为下划线*/
/*分支名中非法字符统一替换为下划线*/
imageTag
=
"192.168.4.36/${harborGroup}/${systemName}:${safeBranchName}-${buildNumber}"
imageTag
=
"192.168.4.36/${harborGroup}/${systemName}:${safeBranchName}-${buildNumber}"
regex
=
"[`,./;\\[\\]&<>?:\"()|-]+"
regex
=
"[`,./;\\[\\]&<>?:\"()|-]+"
...
...
vars/qgDockerPipeline.groovy
View file @
ba8504d6
...
@@ -39,7 +39,7 @@ def call(body) {
...
@@ -39,7 +39,7 @@ def call(body) {
}
}
stage
(
'Docker Build And Push'
)
{
stage
(
'Docker Build And Push'
)
{
_stage
.
docker_build_and_push
(
buildNumber
,
branchName
,
harborGroup
,
contextDir
)
_stage
.
docker_build_and_push
(
buildNumber
,
branchName
,
harborGroup
,
systemName
,
contextDir
)
}
}
stage
(
'Deploy'
)
{
stage
(
'Deploy'
)
{
...
...
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