From a70131ebf38910ccd9f01a37f3ee4ac8de1fdd2b Mon Sep 17 00:00:00 2001
From: iris_cx <cai.xiang1@free-sun.com.cn>
Date: Wed, 15 Nov 2023 08:13:30 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfile=5Fvcmp=5Fscri?=
 =?UTF-8?q?pt=5F1.3.1'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jenkinsfile_vcmp_script_1.3.1        | 24 ++++++++++++++++++++++++
 jenkinsfile_vcmp_script_1.3.6_data_1 | 18 ------------------
 2 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 jenkinsfile_vcmp_script_1.3.1
 delete mode 100644 jenkinsfile_vcmp_script_1.3.6_data_1

diff --git a/jenkinsfile_vcmp_script_1.3.1 b/jenkinsfile_vcmp_script_1.3.1
new file mode 100644
index 0000000..ee7f1ce
--- /dev/null
+++ b/jenkinsfile_vcmp_script_1.3.1
@@ -0,0 +1,24 @@
+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'''
+					pwd
+					ls -al
+					
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/Dockerfile --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/jenkinsfile_vcmp_script_1.3.6_data_1 b/jenkinsfile_vcmp_script_1.3.6_data_1
deleted file mode 100644
index 39e1ecd..0000000
--- a/jenkinsfile_vcmp_script_1.3.6_data_1
+++ /dev/null
@@ -1,18 +0,0 @@
-pipeline {
-    agent {
-        node{
-            label 'jnlp-slave'
-    }
-    }
-    
-    stages {
-        stage('jenkinsfile_vcmp_script_1.3 ......') {
-            steps {
-                buildName "#${BUILD_NUMBER} ~/iot/${JOB_NAME}:${IMAGE_VERSION}"
-                buildDescription "harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION}"
-                sh 'nerdctl build -t harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION} ./code/VideoAccess-VCMP/script/1.3.6/data/1_batch_entry_camera'
-				    sh 'nerdctl push harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION}'
-            }
-        }
-	}
-}
\ No newline at end of file