diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c91d592..a922af2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: VERS_MAIN: '1.0' MACH_NAME: '' MACH_NAME_TEST: '' + MANUFACTURER: '' NEW_REL: '' NET_SHARE_X: '\\10.74.82.201\EgwTech' NET_SHARE_Z: '\\10.74.82.201\Artifacts' @@ -14,7 +15,7 @@ variables: TEMP_PATH: 'C:\MachinesDeploy' MACHINES_PATH_R: 'R:\EgtData\Machines' DEST_MACHINES_PATH_R: 'R:\EgtData\Machines\zTestYAML' - DEST_MACHINES_PATH_H: 'H:\Beam & Wall - Essetre\test' + DEST_MACHINES_PATH_H: 'H:\' SRC_PATH: '' BASE_PATH: '' TEST_PATH: '' @@ -45,9 +46,10 @@ variables: echo "-----------------------" echo " Copia macchina su R" echo "-----------------------" - ROBOCOPY /MIR "$env:SRC_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME\" /XD "bin" - ROBOCOPY "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /E /XD "bin" - ROBOCOPY /MIR "$env:BASE_PATH" "$env:DEST_MACHINES_PATH_R\Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST" + $customerPathR = $env:DEST_MACHINES_PATH_R + "\" + $env:MANUFACTURER + ROBOCOPY /MIR "$env:SRC_PATH" "$customerPathR\$env:MACH_NAME\" /XD "bin" + ROBOCOPY "$env:TEST_PATH" "$customerPathR\$env:MACH_NAME_TEST\" /E /XD "bin" + ROBOCOPY /MIR "$env:BASE_PATH" "$customerPathR\Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST" SLEEP 2 net use R: /delete @@ -61,9 +63,10 @@ variables: echo " Copia macchina su stor01" echo "-----------------------" SLEEP 2 - $destinationPath = "$env:DEST_MACHINES_PATH_H\$env:MACH_NAME" + "\" + $customerPathH = $env:DEST_MACHINES_PATH_H + "\" + $env:MANUFACTURER + "\test" + $destinationPath = "$customerPathH\$env:MACH_NAME" + "\" echo $destinationPath - ROBOCOPY "$env:BASE_PATH" "$destinationPath\" *.zip + # ROBOCOPY "$env:BASE_PATH" "$destinationPath\" *.zip SLEEP 2 net use H: /delete @@ -76,7 +79,8 @@ variables: echo "-----------------------" echo " Copia macchina su R - DEV" echo "-----------------------" - ROBOCOPY /MIR "$env:BASE_PATH" "$env:DEST_MACHINES_PATH_R\Deploy\$env:MACH_NAME\_DEV\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST" + $customerPathR = $env:DEST_MACHINES_PATH_R + "\" + $env:MANUFACTURER + ROBOCOPY /MIR "$env:BASE_PATH" "$customerPathR\Deploy\$env:MACH_NAME\_DEV\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST" SLEEP 2 net use R: /delete @@ -116,15 +120,18 @@ variables: echo "lua54 -o bin\$FileName -s $FileName" } -# helper recupero nome macchina +# helper recupero nome macchina e costruttore .machName-fix: &machName-fix - | echo "-----------------------" - echo " Recupero nome macchina" + echo " Recupero nome macchina e costruttore" echo "-----------------------" $fileName = dir *.mlde $env:MACH_NAME = $fileName.BaseName $env:MACH_NAME_TEST = $env:MACH_NAME + ".TEST" + $comp = $fileName.BaseName -split "-" + $env:MANUFACTURER = $comp[1] + echo $env:MANUFACTURER # helper calcolo versione .version-fix: &version-fix diff --git a/TestMachine.mlde b/TestMachine.mlde index 063f880..7ffdd46 100644 --- a/TestMachine.mlde +++ b/TestMachine.mlde @@ -68,8 +68,8 @@ require( 'EmtGenerator') EgtEnableDebug( false) -PP_VER = '2.6i7' -PP_NVER = '2.6.9.7' +PP_VER = '2.6i10' +PP_NVER = '2.6.9.10' MIN_MACH_VER = '2.5k1' MACH_NAME = 'Essetre-FAST'