free-sun
/
FS-IOT
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

jenkinsfilenew

dev_trial
wenlele 2 years ago
parent
039c5f42f5
commit
9c2a9e8d35
2 changed files with 85 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      jenkinsfilenew_api
  2. 55
      jenkinsfilenew_web

54
jenkinsfilenew_api
View File

@ -1,21 +1,47 @@
// podTemplate {
// node('pod-templ-jenkins-slave-common') {
// env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}"
// env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}"
// env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/FS-IOT.git"
// stage('Run shell') {
// git branch: 'dev_trial', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
// container('image-builder') {
// sh'''
// /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup
// '''
// }
// buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
// buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"
// }
// }
// }
podTemplate { podTemplate {
node('pod-templ-jenkins-slave-common') { node('pod-templ-jenkins-slave-common') {
env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}" env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${SMARTCITY}/${JOB_NAME}"
env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}" env.IMAGE_NAME_SHORT = "${SMARTCITY}/${JOB_NAME}"
env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/FS-IOT.git" env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/free-sun/FS-IOT.git"
stage('Run shell') {
git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
container('image-builder') {
sh'''
pwd
ls -al
stage('Run shell') { /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup
git branch: 'dev_trial', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
container('image-builder') { '''
sh''' }
/kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup
'''
}
buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"
} }
} }
} }

55
jenkinsfilenew_web
View File

@ -1,21 +1,48 @@
// podTemplate {
// node('pod-templ-jenkins-slave-common') {
// env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}"
// env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}"
// env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/FS-IOT.git"
// stage('Run shell') {
// git branch: 'dev_trial', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
// container('image-builder') {
// sh'''
// /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup
// '''
// }
// buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
// buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"
// }
// }
// }
podTemplate { podTemplate {
node('pod-templ-jenkins-slave-common') { node('pod-templ-jenkins-slave-common') {
env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}" env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${SMARTCITY}/${JOB_NAME}"
env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}" env.IMAGE_NAME_SHORT = "${SMARTCITY}/${JOB_NAME}"
env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/FS-IOT.git" env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/free-sun/FS-IOT.git"
stage('Run shell') {
git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
container('image-builder') {
sh'''
pwd
ls -al
stage('Run shell') { /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup
git branch: 'dev_trial', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
container('image-builder') { '''
sh''' }
/kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup
'''
}
buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"
} }
} }
} }
Write Preview
Loading…
Cancel
Save