Merge branch 'feature/2023-12-10_CICD' of serset/Sers into release/develop

Publish/DevOps2/jenkins-bash/CICD.ki.git_Multibranch.deploy.jenkinsfile

@@ -16,9 +16,9 @@ pipeline {
         versionSuffix = "-${stageName}${env.build_number}"
 
         //basePath = "/root/docker-cache/jenkins/jenkins_home/workspace/${APPNAME}/${stageName}/${env.BRANCH_NAME}/${env.build_number}"
-	basePath="${env.WORKSPACE}"
+        basePath="${env.WORKSPACE}"
         // set to "  "  if want to skip copy
-        releasePath = "/root/docker-cache/jenkins/jenkins_home/jenkinsReleaseFile/${stageName}/${env.BRANCH_NAME}/${APPNAME}"
+        releasePath = "  "
 
         NUGET_PATH = "/root/docker-cache/jenkins/jenkins_home/workspace/.nuget"
 
@@ -46,6 +46,12 @@ pipeline {
 
                         env.codePath = "/root/docker-cache/jenkins/" + basePath.substring(5, basePath.length()) 
 
+                        // get APPNAME
+                        env.APPNAME = readFile("Publish/DevOps2/jenkins-bash/env.appVersion.txt")
+
+                        env.releasePath = "/root/docker-cache/jenkins/jenkins_home/jenkinsReleaseFile/${stageName}/${env.BRANCH_NAME}/${APPNAME}"
+
+
                         echo "-------- APPNAME: [$APPNAME]"
                         echo "-------- basePath: [$basePath]"
                         echo "-------- releasePath: [$releasePath]"
@@ -66,13 +72,11 @@ pipeline {
             steps {
                 script {
                     echo "#2.1 change-app-version"
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps2/build-bash; source 22.add-suffix-to-app-version.bash;    echo \$nextAppVersion > $codePath/Publish/appVersion.txt '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps2/build-bash; source 22.add-suffix-to-app-version.bash;    echo \$nextAppVersion > $codePath/Publish/DevOps2/jenkins-bash/env.appVersion.txt '"
 		    
                     echo "#2.2 get app version"
-		    def data = readFile("Publish/appVersion.txt")
-		    def lines = data.readLines()
-		    env.appVersion = lines[0]
-		    echo "appVersion: [${env.appVersion}]"
+                    env.appVersion = readFile("Publish/DevOps2/jenkins-bash/env.appVersion.txt")
+                    echo "appVersion: [${env.appVersion}]"
                 }
             }
         }
@@ -120,7 +124,7 @@ pipeline {
 
                     remote.name = "k8s-ssh"
                     remote.host = "k8s.lith.cloud"
-		    
+
                     remote.user = "${k8s_ssh_account_USR}"
                     remote.password = "${k8s_ssh_account_PSW}"
 
@@ -145,7 +149,7 @@ pipeline {
                 if ( inputChoice == "yes" ) {
                     echo "clean up workspace directory"
                     cleanWs()
-		    
+
                     // clean up tmp directory
                     dir("${workspace}@tmp") {
                         deleteDir()

Publish/DevOps2/jenkins-bash/CICD.ki.git_Multibranch.deploy.jenkinsfile.env

@@ -1 +0,0 @@
-APPNAME=Sers

Publish/DevOps2/jenkins-bash/env.APPNAME.txt

@@ -0,0 +1 @@
+Sers