diff --git a/groovy/deploy.groovy b/groovy/deploy.groovy new file mode 100644 index 0000000..4c3ea20 --- /dev/null +++ b/groovy/deploy.groovy @@ -0,0 +1,5 @@ +def deploy(String versionName, String staticFolderName) { + sshPublisher(publishers: [sshPublisherDesc(configName: 'bro-js-static', 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 diff --git a/groovy/tag.groovy b/groovy/tag.groovy new file mode 100644 index 0000000..5602a19 --- /dev/null +++ b/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 diff --git a/predeploy/Jenkinsfile b/predeploy/Jenkinsfile index 47c1733..e06fe28 100644 --- a/predeploy/Jenkinsfile +++ b/predeploy/Jenkinsfile @@ -1,31 +1,71 @@ +// 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() + echo "tag is -> ${tag}" + println "tagNoV is -> ${tagModule.getTagNoV()}" 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) - 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}" + def tagNoV = tagModule.getTagNoV() + sh "mkdir ${tagNoV}" + sh "mv ${TARGET_FOLDER}/* ${tagNoV}" + archiveArtifacts artifacts: "${tagNoV}/*/**" } 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 '${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: "${TARGET_FOLDER}/*/**" } } } -stage ('archiving') { - // Archive the build output artifacts. - script { - archiveArtifacts artifacts: "${TARGET_FOLDER}/*/**" - } -} +// stage ('archiving') { +// // Archive the build output artifacts. +// script { +// archiveArtifacts artifacts: "${TARGET_FOLDER}/*/**" +// } +// }