deploy config name as parameter

build/prod/Jenkinsfile

@@ -9,7 +9,7 @@ stage ('production build') {
             sh "VERSION=${tagNoV} npm run build:prod";
         } else {
             echo 'tag not found'
-            sh "VERSION=master npm run build:prod"
+            sh "VERSION=${branchName} npm run build:prod"
         }
 
         sh 'ls dist';

groovy/deploy.groovy

@@ -0,0 +1,5 @@
+def deploy(String versionName, String staticFolderName, String sshConfigName = 'bro-js-static') {
+    sshPublisher(publishers: [sshPublisherDesc(configName: sshConfigName, transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: staticFolderName, remoteDirectorySDF: false, removePrefix: '', sourceFiles: "${versionName}/**")], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: true)])
+}
+
+return this

groovy/tag.groovy

@@ -0,0 +1,12 @@
+String tag = ''
+
+def calcTag() {
+    tag = sh(returnStdout: true, script: "git tag --contains").trim()
+    return tag
+}
+
+def getTagNoV() {
+    return tag.substring(1)
+}
+
+return this

install/ci/Jenkinsfile

@@ -1,4 +1,19 @@
 stage('install:ci') {
+    def tag = sh(returnStdout: true, script: "git tag --contains").trim()
+    def branchName = sh(returnStdout: true, script: "git rev-parse --abbrev-ref HEAD").trim()
+    def commit = sh(returnStdout: true, script: 'git log -1 --oneline').trim()
+    String commitMsg = commit.substring( commit.indexOf(' ') ).trim()
+    def lastLog = sh(returnStdout: true, script: "git log -1").trim()
+    if (tag) {
+      currentBuild.displayName = "#${BUILD_NUMBER}, tag ${tag}"
+    } else {
+      currentBuild.displayName = "#${BUILD_NUMBER}, branch ${branchName}"
+    }
+
+    String author = sh(returnStdout: true, script: "git log -1 --pretty=format:'%an'").trim()
+    currentBuild.description = "${author}<br />${commitMsg}"
+    // currentBuild.description = "#${BUILD_NUMBER}, branch ${branchName}, tag ${tag ? tag : 'no tag'}\n\n${lastLog}"
     echo 'starting installing'
-    sh 'npm ci'
+    sh "pwd"
+    sh 'npm ci --progress=false --loglevel=error --fetch-retries=3'
 }

predeploy/Jenkinsfile

@@ -1,31 +1,69 @@
+// stage ('predeploy') {
+//     echo 'checking tag'
+//     script {
+//         def tag = sh(returnStdout: true, script: "git tag --contains").trim()
+//         def branchName = sh(returnStdout: true, script: "git rev-parse --abbrev-ref HEAD").trim()
+
+//         if (tag) {
+//             echo 'found tag ' + tag
+//             addBadge(
+//               icon: 'completed.gif',
+//               text: "Release ${tag}")
+//             def tagNoV = tag.substring(1)
+//             sh "cd ${TARGET_FOLDER}; echo '${tagNoV}' > ${DEPLOY_VERSION_VAR}";
+//             // sh "cd ${TARGET_FOLDER} ; echo 'mkdir ${tagNoV}; mv ./${branchName}/* ./${tagNoV}; rm -r -d ./${branchName}; rm ${DEPLOY_VERSION_VAR}' > ${DEPLOY_VERSION_VAR}"
+//         } else {
+//             echo 'tag not found'
+//             addBadge(
+//               icon: 'info.gif',
+//               text: "Сборка в master")
+//             sh "cd ${TARGET_FOLDER}; echo '${branchName}' > ${DEPLOY_VERSION_VAR}"
+//             // sh "cd ${TARGET_FOLDER} ; echo 'rm ${DEPLOY_VERSION_VAR}' > ${DEPLOY_VERSION_VAR}"
+//         }
+//     }
+// }
+
+// stage ('archiving') {
+//     // Archive the build output artifacts.
+//     script {
+//         archiveArtifacts artifacts: "${TARGET_FOLDER}/*/**"
+//     }
+// }
+
+def tagModule = load "${JEN_FILES_TMP_NAME}/groovy/tag.groovy"
+
 stage ('predeploy') {
     echo 'checking tag'
     script {
-        def tag = sh(returnStdout: true, script: "git tag --contains").trim()
+        tag = tagModule.calcTag()
         def branchName = sh(returnStdout: true, script: "git rev-parse --abbrev-ref HEAD").trim()
 
         if (tag) {
-            echo 'found tag ' + tag
+            println "found tag ${tag}"
             addBadge(
               icon: 'completed.gif',
               text: "Release ${tag}")
-            def tagNoV = tag.substring(1)
+            def tagNoV = tagModule.getTagNoV()
-            sh "cd ${TARGET_FOLDER}; echo '${tagNoV}' > ${DEPLOY_VERSION_VAR}";
+            sh "mkdir ${tagNoV}"
-            // sh "cd ${TARGET_FOLDER} ; echo 'mkdir ${tagNoV}; mv ./${branchName}/* ./${tagNoV}; rm -r -d ./${branchName}; rm ${DEPLOY_VERSION_VAR}' > ${DEPLOY_VERSION_VAR}"
+            sh "mv ${TARGET_FOLDER}/* ${tagNoV}"
+            archiveArtifacts artifacts: "${tagNoV}/*/**"
         } else {
             echo 'tag not found'
             addBadge(
               icon: 'info.gif',
-              text: "Сборка в master")
+              text: "Сборка в ${branchName}")
-            sh "cd ${TARGET_FOLDER}; echo '${branchName}' > ${DEPLOY_VERSION_VAR}"
+            // sh "cd ${TARGET_FOLDER}; echo '${branchName}' > ${DEPLOY_VERSION_VAR}"
+            sh "mkdir ${branchName}"
+            sh "mv ${TARGET_FOLDER}/* ${branchName}"
             // sh "cd ${TARGET_FOLDER} ; echo 'rm ${DEPLOY_VERSION_VAR}' > ${DEPLOY_VERSION_VAR}"
+            archiveArtifacts artifacts: "${branchName}/*/**"
         }
     }
 }
 
-stage ('archiving') {
+// stage ('archiving') {
-    // Archive the build output artifacts.
+//     // Archive the build output artifacts.
-    script {
+//     script {
-        archiveArtifacts artifacts: "${TARGET_FOLDER}/*/**"
+//         archiveArtifacts artifacts: "${TARGET_FOLDER}/*/**"
-    }
+//     }
-}
+// }

stats/Jenkinsfile

@@ -2,8 +2,8 @@ stage('stats') {
     echo 'checking node and npm versions'
     sh 'node -v'
     sh 'npm -v'
-    sh 'ls -a'
+    // sh 'ls -a'
-    sh 'df -h'
+    // sh 'df -h'
-    sh 'free -m'
+    // sh 'free -m'
     // sh 'vmstat -s'
 }