Merge branch 'develop' into IobMan

This commit is contained in:
Samuele E. Locatelli
2020-02-05 12:16:44 +01:00
Vendored
+5 -3
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=664']) {
withEnv(['NEXT_BUILD_NUMBER=665']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'
@@ -153,10 +153,12 @@ pipeline {
if (env.BRANCH_NAME == "develop")
{
env.classifier = "unstable"
env.version = "unstable"
}
else
{
env.classifier = ""
env.classifier = ""
env.version = "stable"
}
// ora mi occupo delle operazioni di invio a NEXUS...
nexusArtifactUploader(
@@ -165,7 +167,7 @@ pipeline {
nexusUrl: 'nexus.steamware.net',
groupId: 'MAPO',
//version: "${env.versionNumber}",
version: "stable",
version: "${env.version}",
repository: 'utility',
credentialsId: 'bc9d8e92-4302-3266-817f-7b58501d12d5',
artifacts: [