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
3865679b
Commit
3865679b
authored
Jan 25, 2019
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
aa54c497
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
StageBucketTke.groovy
src/org/qg/docker_new/StageBucketTke.groovy
+3
-3
qgDockerPiplineWithDockerSlaveTke.groovy
vars/qgDockerPiplineWithDockerSlaveTke.groovy
+2
-1
No files found.
src/org/qg/docker_new/StageBucketTke.groovy
View file @
3865679b
...
@@ -21,8 +21,8 @@ def contextMkdir(key) {
...
@@ -21,8 +21,8 @@ def contextMkdir(key) {
def
imageTag
(
harborGroup
,
k8sSystemName
,
safeBranchName
,
tagName
){
def
imageTag
(
harborGroup
,
k8sSystemName
,
safeBranchName
,
tagName
){
def
imageTag4_4
=[:]
def
imageTag4_4
=[:]
imageTag4_4
[
"harborHost"
]=
"http://192.168.4.4"
imageTag4_4
[
"harborHost"
]=
"http://192.168.4.4"
imageTag4_4
[
"imageTag"
]
=
"
192.168.4.4/
${harborGroup}/${k8sSystemName}:tke${safeBranchName}-${tagName}"
imageTag4_4
[
"imageTag"
]
=
"${harborGroup}/${k8sSystemName}:tke${safeBranchName}-${tagName}"
imageTag4_4
[
"imageTagCode"
]
=
"
192.168.4.4/
${harborGroup}/${k8sSystemName}:tkeCode${safeBranchName}-${tagName}"
imageTag4_4
[
"imageTagCode"
]
=
"${harborGroup}/${k8sSystemName}:tkeCode${safeBranchName}-${tagName}"
return
[
imageTag4_4
]
return
[
imageTag4_4
]
}
}
...
@@ -405,7 +405,7 @@ def prepare_java(systemName, contextDir) {
...
@@ -405,7 +405,7 @@ def prepare_java(systemName, contextDir) {
def
prepare_nodejs
(
systemName
,
contextDir
)
{
def
prepare_nodejs
(
systemName
,
contextDir
)
{
sh
"cp -rf /home/quant_group/qg-dockerfiles/tke/nodejs/* ${contextDir}"
sh
"cp -rf /home/quant_group/qg-dockerfiles/tke/nodejs/* ${contextDir}"
sh
"cp -rf /home/quant_group/config_repository/
nodejs/${systemName}.js ${systemName}.env.config"
sh
"cp -rf /home/quant_group/config_repository/
tke/nodejs/${systemName}.js ${systemName}.env.config"
sh
"cp -rf /home/quant_group/qg-dockerfiles/tke/ui/npmrc/common-npmrc /root/.npmrc"
sh
"cp -rf /home/quant_group/qg-dockerfiles/tke/ui/npmrc/common-npmrc /root/.npmrc"
}
}
...
...
vars/qgDockerPiplineWithDockerSlaveTke.groovy
View file @
3865679b
...
@@ -6,7 +6,7 @@ def call(body) {
...
@@ -6,7 +6,7 @@ def call(body) {
ansiColor
(
'xterm'
)
{
ansiColor
(
'xterm'
)
{
def
harborGroup
=
"library"
//
def harborGroup = "library"
def
_stage
=
new
org
.
qg
.
docker_new
.
StageBucketTke
()
def
_stage
=
new
org
.
qg
.
docker_new
.
StageBucketTke
()
def
_utils
=
new
org
.
qg
.
docker_new
.
Utils
()
def
_utils
=
new
org
.
qg
.
docker_new
.
Utils
()
...
@@ -21,6 +21,7 @@ def call(body) {
...
@@ -21,6 +21,7 @@ def call(body) {
def
imageType
=
env
.
TYPE
def
imageType
=
env
.
TYPE
def
buildNumber
=
env
.
BUILD_NUMBER
def
buildNumber
=
env
.
BUILD_NUMBER
def
cluster
=
env
.
CLUSTER
def
cluster
=
env
.
CLUSTER
def
harborGroup
=
env
.
IMAGE_REPOSITORY
// QG/XXX or QG--QG/systemName--systemName
// QG/XXX or QG--QG/systemName--systemName
t
=
gitRepo
.
split
(
"/"
)
t
=
gitRepo
.
split
(
"/"
)
...
...
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