From 9c2a9e8d356028f31db64b5ed87315127e3b094d Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Wed, 19 Jul 2023 19:45:52 +0800
Subject: [PATCH] jenkinsfilenew

---
 jenkinsfilenew_api | 58 ++++++++++++++++++++++++++++++++-------------
 jenkinsfilenew_web | 59 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 85 insertions(+), 32 deletions(-)

diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api
index 4cfda67..3a77e92 100644
--- a/jenkinsfilenew_api
+++ b/jenkinsfilenew_api
@@ -1,21 +1,47 @@
-podTemplate {
-    node('pod-templ-jenkins-slave-common') {
+// 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"
+// 		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}"
+// 	    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 
-			    '''			    
-		    }
+// 		    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}"			
-		}
-	}
+// 		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+// 		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+// 		}
+// 	}
+// }
+
+podTemplate {
+    node('pod-templ-jenkins-slave-common') {
+                
+                env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${SMARTCITY}/${JOB_NAME}"
+                env.IMAGE_NAME_SHORT = "${SMARTCITY}/${JOB_NAME}"
+        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
+                                        
+                                    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+
+                            '''                            
+                    }
+                        
+                    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+                    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"                        
+                }
+        }
 }
\ No newline at end of file
diff --git a/jenkinsfilenew_web b/jenkinsfilenew_web
index a146728..856743f 100644
--- a/jenkinsfilenew_web
+++ b/jenkinsfilenew_web
@@ -1,21 +1,48 @@
-podTemplate {
-    node('pod-templ-jenkins-slave-common') {
+// 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"
+// 		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}"
+// 	    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 
-			    '''			    
-		    }
+// 		    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}"			
-		}
-	}
+// 		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+// 		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+// 		}
+// 	}
+// }
+
+
+podTemplate {
+    node('pod-templ-jenkins-slave-common') {
+                
+                env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${SMARTCITY}/${JOB_NAME}"
+                env.IMAGE_NAME_SHORT = "${SMARTCITY}/${JOB_NAME}"
+        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
+                                        
+                                    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+
+                            '''                            
+                    }
+                        
+                    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+                    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"                        
+                }
+        }
 }
\ No newline at end of file