From 6e129816438c7498b90f129d800f3c19eab86ea8 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 30 Oct 2018 12:39:20 +0100 Subject: [PATCH] Fix timeout + nuova vers x install --- IOB-WIN/DATA/CONF/2999.ini | 3 ++- IOB-WIN/DATA/CONF/3000.ini | 3 ++- IOB-WIN/DATA/CONF/3001.ini | 3 ++- IOB-WIN/DATA/CONF/3002.ini | 3 ++- IOB-WIN/DATA/CONF/3003.ini | 3 ++- IOB-WIN/DATA/CONF/3004.ini | 3 ++- IOB-WIN/DATA/CONF/3005.ini | 3 ++- IOB-WIN/DATA/CONF/3006.ini | 3 ++- IOB-WIN/DATA/CONF/3007.ini | 3 ++- IOB-WIN/DATA/CONF/3010.ini | 1 + IOB-WIN/DATA/CONF/3011.ini | 3 ++- IOB-WIN/DATA/CONF/3012.ini | 3 ++- IOB-WIN/DATA/CONF/3013.ini | 3 ++- IOB-WIN/DATA/CONF/L014.ini | 3 ++- IOB-WIN/DATA/CONF/L017.ini | 3 ++- Jenkinsfile | 2 +- 16 files changed, 30 insertions(+), 15 deletions(-) diff --git a/IOB-WIN/DATA/CONF/2999.ini b/IOB-WIN/DATA/CONF/2999.ini index 037571db..58ed8751 100644 --- a/IOB-WIN/DATA/CONF/2999.ini +++ b/IOB-WIN/DATA/CONF/2999.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=DEMO +CNCTYPE=DEMO +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=STEAMWARE diff --git a/IOB-WIN/DATA/CONF/3000.ini b/IOB-WIN/DATA/CONF/3000.ini index 037571db..da2406e3 100644 --- a/IOB-WIN/DATA/CONF/3000.ini +++ b/IOB-WIN/DATA/CONF/3000.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=DEMO +CNCTYPE=DEMO +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=STEAMWARE diff --git a/IOB-WIN/DATA/CONF/3001.ini b/IOB-WIN/DATA/CONF/3001.ini index fc03d30d..450c1616 100644 --- a/IOB-WIN/DATA/CONF/3001.ini +++ b/IOB-WIN/DATA/CONF/3001.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=TORNOS diff --git a/IOB-WIN/DATA/CONF/3002.ini b/IOB-WIN/DATA/CONF/3002.ini index ee460f5b..e107d92b 100644 --- a/IOB-WIN/DATA/CONF/3002.ini +++ b/IOB-WIN/DATA/CONF/3002.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=TORNOS diff --git a/IOB-WIN/DATA/CONF/3003.ini b/IOB-WIN/DATA/CONF/3003.ini index 5de8dbfd..5e6a4089 100644 --- a/IOB-WIN/DATA/CONF/3003.ini +++ b/IOB-WIN/DATA/CONF/3003.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=CMZ diff --git a/IOB-WIN/DATA/CONF/3004.ini b/IOB-WIN/DATA/CONF/3004.ini index 5d242cd4..16d0a2b1 100644 --- a/IOB-WIN/DATA/CONF/3004.ini +++ b/IOB-WIN/DATA/CONF/3004.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=BIGLIA diff --git a/IOB-WIN/DATA/CONF/3005.ini b/IOB-WIN/DATA/CONF/3005.ini index 59b80999..6cb738f6 100644 --- a/IOB-WIN/DATA/CONF/3005.ini +++ b/IOB-WIN/DATA/CONF/3005.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=BIGLIA diff --git a/IOB-WIN/DATA/CONF/3006.ini b/IOB-WIN/DATA/CONF/3006.ini index e77dc0f2..647b364e 100644 --- a/IOB-WIN/DATA/CONF/3006.ini +++ b/IOB-WIN/DATA/CONF/3006.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=HANWHA diff --git a/IOB-WIN/DATA/CONF/3007.ini b/IOB-WIN/DATA/CONF/3007.ini index 2f322767..06a04190 100644 --- a/IOB-WIN/DATA/CONF/3007.ini +++ b/IOB-WIN/DATA/CONF/3007.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=STAR diff --git a/IOB-WIN/DATA/CONF/3010.ini b/IOB-WIN/DATA/CONF/3010.ini index 731b38a8..27cfee85 100644 --- a/IOB-WIN/DATA/CONF/3010.ini +++ b/IOB-WIN/DATA/CONF/3010.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] CNCTYPE=SIEMENS_TORRI +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=TORRI diff --git a/IOB-WIN/DATA/CONF/3011.ini b/IOB-WIN/DATA/CONF/3011.ini index 968fbe6d..10d86a16 100644 --- a/IOB-WIN/DATA/CONF/3011.ini +++ b/IOB-WIN/DATA/CONF/3011.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=SIEMENS_TORRI +CNCTYPE=SIEMENS_TORRI +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=TORRI diff --git a/IOB-WIN/DATA/CONF/3012.ini b/IOB-WIN/DATA/CONF/3012.ini index f58ce188..eeb6c157 100644 --- a/IOB-WIN/DATA/CONF/3012.ini +++ b/IOB-WIN/DATA/CONF/3012.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=TAKAHASHI diff --git a/IOB-WIN/DATA/CONF/3013.ini b/IOB-WIN/DATA/CONF/3013.ini index 9ff24b00..64c60faa 100644 --- a/IOB-WIN/DATA/CONF/3013.ini +++ b/IOB-WIN/DATA/CONF/3013.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=SIEMENS_TORRI +CNCTYPE=SIEMENS_TORRI +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=TORRI diff --git a/IOB-WIN/DATA/CONF/L014.ini b/IOB-WIN/DATA/CONF/L014.ini index 2686b85b..870a18fd 100644 --- a/IOB-WIN/DATA/CONF/L014.ini +++ b/IOB-WIN/DATA/CONF/L014.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=COLCOM diff --git a/IOB-WIN/DATA/CONF/L017.ini b/IOB-WIN/DATA/CONF/L017.ini index 78cd986a..c7107744 100644 --- a/IOB-WIN/DATA/CONF/L017.ini +++ b/IOB-WIN/DATA/CONF/L017.ini @@ -1,6 +1,7 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=FANUC +CNCTYPE=FANUC +PING_MS_TIMEOUT=500 [MACHINE] VENDOR=COLCOM diff --git a/Jenkinsfile b/Jenkinsfile index 95465e9f..09338af2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=289']) { + withEnv(['NEXT_BUILD_NUMBER=290']) { // env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'