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
bb381567
Commit
bb381567
authored
Apr 16, 2018
by
wentao.suo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change 4.36 to 4.4
parent
28c3d296
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
StageBucket.groovy
src/org/qg/docker/StageBucket.groovy
+1
-1
StageBucket.groovy
src/org/qg/docker_new/StageBucket.groovy
+2
-2
No files found.
src/org/qg/docker/StageBucket.groovy
View file @
bb381567
...
...
@@ -233,7 +233,7 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
imageTag
=
"192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
withDockerServer
([
uri:
"tcp://192.168.4.96:2375/"
])
{
withDockerRegistry
([
credentialsId:
'harbor-qajenkins'
,
url:
"http://192.168.4.
36
"
])
{
withDockerRegistry
([
credentialsId:
'harbor-qajenkins'
,
url:
"http://192.168.4.
4
"
])
{
def
build_schema
=
"BUILD_TIME:${timeNow}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}"
echo
build_schema
...
...
src/org/qg/docker_new/StageBucket.groovy
View file @
bb381567
...
...
@@ -19,7 +19,7 @@ def contextMkdir(key) {
}
def
imageTag
(
harborGroup
,
k8sSystemName
,
safeBranchName
,
timeStemp
){
return
"192.168.4.
36
/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
return
"192.168.4.
4
/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
}
def
init_dependency
()
{
...
...
@@ -392,7 +392,7 @@ def check_and_build(buildType,systemName,branchName,contextDir){
def
dockerbuild_and_push
(
imageTag
,
buildNumber
,
systemName
,
branchName
,
cluster
,
timeStemp
,
contextDir
){
//systemName == originSystemName
stage
(
'Docker Build And Push'
)
{
withDockerRegistry
([
credentialsId:
'harbor-qajenkins'
,
url:
"http://192.168.4.
3
"
])
{
withDockerRegistry
([
credentialsId:
'harbor-qajenkins'
,
url:
"http://192.168.4.
4
"
])
{
def
build_schema
=
"BUILD_TIME:${timeStemp}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}@CLUSTER:${cluster}"
echo
build_schema
def
args
=
""
...
...
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