Merge pull request #16 from Azure/support-latest-image

Support latest images for Windows 1.2.3 and Centos 1.1.3.
This commit is contained in:
matthew-rollitt 2018-05-29 15:50:39 +12:00 коммит произвёл GitHub
Родитель 19aafe6952 e3e262fbdb
Коммит bfe813ff28
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
23 изменённых файлов: 122 добавлений и 26 удалений

Просмотреть файл

@ -209,7 +209,12 @@ $max_exec = "3dsmaxcmdio.exe"
if ($env:3DSMAX_2018 -and (Test-Path "$env:3DSMAX_2018"))
{
# New image
$max_exec = "${env:3DSMAX_2018}\3dsmaxcmdio.exe"
$max_exec = "${env:3DSMAX_2018}3dsmaxcmdio.exe"
}
if($env:3DSMAX_2018_EXEC -MATCH "cmdio")
{
$max_exec = $env:3DSMAX_2018_EXEC
}
Write-Host "Executing $max_exec -secure off -v:5 -rfw:0 $cameraParam $renderPresetFileParam $additionalArgumentsParam -preRenderScript:`"$pre_render_script`" -start:$start -end:$end -outputName:`"$outputName`" -width:$width -height:$height $pathFileParam `"$sceneFile`""

Просмотреть файл

@ -108,7 +108,7 @@
"publisher": "batch",
"offer": "rendering-windows2016",
"sku": "rendering",
"version": "latest"
"version": "1.2.3"
},
"nodeAgentSKUId": "batch.node.windows amd64"
}

Просмотреть файл

@ -170,7 +170,7 @@
},
"variables":{
"VRayRT":"cmd.exe /c start C:\\server\\3dsmaxVray\\bin\\vray.exe -server -portNumber=[parameters('vrayPort')]",
"VRayAdv":"cmd.exe /c start \"\" \"C:\\Autodesk\\3ds Max 2018\\vrayspawner2018.exe\" \"-port=[parameters('vrayPort')]\""
"VRayAdv":"cmd.exe /c start \"\" \"C:\\Autodesk\\3dsMax2018\\vrayspawner2018.exe\" \"-port=[parameters('vrayPort')]\""
},
"job":{
"type":"Microsoft.Batch/batchAccounts/jobs",
@ -205,9 +205,8 @@
},
"multiInstanceSettings":{
"numberOfInstances":"[parameters('nodeCount')]",
"coordinationCommandLine":"cmd.exe /c if \"[parameters('vrayRenderer')]\" == \"VRayAdv\" (cmd.exe /c start \"\" \"C:\\Autodesk\\3ds Max 2018\\vrayspawner2018.exe\" \"-port=[parameters('vrayPort')]\") else (cmd.exe /c start C:\\server\\3dsmaxVray\\bin\\vray.exe -server -portNumber=[parameters('vrayPort')])",
"commonResourceFiles":[
"coordinationCommandLine":"cmd.exe /c if \"[parameters('vrayRenderer')]\" == \"VRayAdv\" (cmd.exe /c start \"\" \"C:\\Autodesk\\3dsMax2018\\vrayspawner2018.exe\" \"-port=[parameters('vrayPort')]\") else (cmd.exe /c start C:\\server\\3dsmaxVray\\bin\\vray.exe -server -portNumber=[parameters('vrayPort')])",
"commonResourceFiles":[
]
},
"resourceFiles":[

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-windows2016",
"sku": "rendering",
"version": "1.1.7"
"version": "1.2.3"
},
"nodeAgentSKUId": "batch.node.windows amd64"
}

Просмотреть файл

@ -59,7 +59,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "mkdir images & kick -i \"%AZ_BATCH_TASK_WORKING_DIR%\\assets\\[parameters('sceneFile')]\" -dw -v 6 -of png -o \"%AZ_BATCH_TASK_WORKING_DIR%\\images\\[parameters('sceneFile')].png\"",
"commandLine": "mkdir images & %ARNOLD_2017_EXEC% -i \"%AZ_BATCH_TASK_WORKING_DIR%\\assets\\[parameters('sceneFile')]\" -dw -v 6 -of png -o \"%AZ_BATCH_TASK_WORKING_DIR%\\images\\[parameters('sceneFile')].png\"",
"resourceFiles": [
{
"source": {

Просмотреть файл

@ -90,7 +90,7 @@
"publisher": "batch",
"offer": "rendering-windows2016",
"sku": "rendering",
"version": "1.1.7"
"version": "1.2.3"
},
"nodeAgentSKUId": "batch.node.windows amd64"
}

Просмотреть файл

@ -76,7 +76,7 @@
"publisher": "batch",
"offer": "rendering-windows2016",
"sku": "rendering",
"version": "1.2.1"
"version": "1.2.3"
},
"nodeAgentSKUId": "batch.node.windows amd64"
}

Просмотреть файл

@ -17,6 +17,17 @@
"description": "The unique name of the job."
}
},
"mayaVersion": {
"type": "string",
"defaultValue": "Maya2018",
"metadata": {
"description": "The renderer to use"
},
"allowedValues":[
"Maya2017",
"Maya2018"
]
},
"inputData": {
"type": "string",
"metadata": {
@ -103,7 +114,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "mkdir \"$AZ_BATCH_TASK_WORKING_DIR/thumbs\";sudo mkdir -m a=rwx -p \"/X\";sudo mount --rbind $AZ_BATCH_JOB_PREP_WORKING_DIR/assets /X;Render -renderer arnold -ai:lve 1 [parameters('additionalFlags')] -proj \"$AZ_BATCH_JOB_PREP_WORKING_DIR\" -rd \"$AZ_BATCH_TASK_WORKING_DIR/images\" -s {0} -e {0} \"/X/[parameters('sceneFile')]\";err=$?;sudo umount \"/X\";exit $err",
"commandLine": "mkdir \"$AZ_BATCH_TASK_WORKING_DIR/thumbs\";sudo mkdir -m a=rwx -p \"/X\";sudo mount --rbind $AZ_BATCH_JOB_PREP_WORKING_DIR/assets /X;export maya_version=[parameters('mayaVersion')].sh;export maya_version=${{maya_version,,}};$maya_version -r arnold -ai:lve 1 [parameters('additionalFlags')] -proj \"$AZ_BATCH_JOB_PREP_WORKING_DIR\" -rd \"$AZ_BATCH_TASK_WORKING_DIR/images\" -s {0} -e {0} \"/X/[parameters('sceneFile')]\";err=$?;sudo umount \"/X\";exit $err",
"environmentSettings": [
{
"name": "MAYA_SCRIPT_PATH",

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-centos73",
"sku": "rendering",
"version": "1.0.8"
"version": "1.1.3"
},
"nodeAgentSKUId": "batch.node.centos 7"
}

Просмотреть файл

@ -17,6 +17,17 @@
"description": "The unique name of the job."
}
},
"mayaVersion": {
"type": "string",
"defaultValue": "Maya2018",
"metadata": {
"description": "The renderer to use"
},
"allowedValues":[
"Maya2017",
"Maya2018"
]
},
"inputData": {
"type": "string",
"metadata": {
@ -68,6 +79,10 @@
}
}
},
"variables":{
"Maya2017":"%MAYA_2017_EXEC%",
"Maya2018":"%MAYA_2018_EXEC%"
},
"job": {
"type": "Microsoft.Batch/batchAccounts/jobs",
"properties": {
@ -103,7 +118,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "mkdir \"%AZ_BATCH_TASK_WORKING_DIR%\\thumbs\" & subst X: %AZ_BATCH_JOB_PREP_WORKING_DIR%\\assets & render -renderer arnold -ai:lve 1 [parameters('additionalFlags')] -proj \"%AZ_BATCH_JOB_PREP_WORKING_DIR%\" -rd \"%AZ_BATCH_TASK_WORKING_DIR%\\images\" -s {0} -e {0} \"X:\\[parameters('sceneFile')]\"",
"commandLine": "mkdir \"%AZ_BATCH_TASK_WORKING_DIR%\\thumbs\" & subst X: %AZ_BATCH_JOB_PREP_WORKING_DIR%\\assets & cmd.exe /v /c \"(if \"[parameters('mayaVersion')]\" == 'Maya2018' (SET MAYA_VERSION=%MAYA_2018_EXEC%) else (SET MAYA_VERSION=%MAYA_2017_EXEC%)) && !MAYA_VERSION! -renderer arnold -ai:lve 1 [parameters('additionalFlags')] -proj \"%AZ_BATCH_JOB_PREP_WORKING_DIR%\" -rd \"%AZ_BATCH_TASK_WORKING_DIR%\\images\" -s {0} -e {0} \"X:\\[parameters('sceneFile')]\"\"",
"environmentSettings": [
{
"name": "MAYA_SCRIPT_PATH",

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-windows2016",
"sku": "rendering",
"version": "1.1.7"
"version": "1.2.3"
},
"nodeAgentSKUId": "batch.node.windows amd64"
}

Просмотреть файл

@ -17,6 +17,17 @@
"description": "The unique name of the job."
}
},
"mayaVersion": {
"type": "string",
"defaultValue": "Maya2018",
"metadata": {
"description": "The renderer to use"
},
"allowedValues":[
"Maya2017",
"Maya2018"
]
},
"inputData": {
"type": "string",
"metadata": {
@ -32,6 +43,13 @@
"dependsOn": "inputData"
}
},
"additionalFlags": {
"type": "string",
"defaultValue": " ",
"metadata": {
"description": "Any additional flags to pass to the renderer. Example: -of png"
}
},
"frameStart": {
"type": "int",
"defaultValue": 1,
@ -96,7 +114,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "mkdir \"$AZ_BATCH_TASK_WORKING_DIR/thumbs\";sudo mkdir -m a=rwx -p \"/X\";sudo mount --rbind $AZ_BATCH_JOB_PREP_WORKING_DIR/assets /X;Render -renderer sw -proj \"$AZ_BATCH_JOB_PREP_WORKING_DIR\" -rd \"$AZ_BATCH_TASK_WORKING_DIR/images\" -s {0} -e {0} \"/X/[parameters('sceneFile')]\";err=$?;sudo umount \"/X\";exit $err",
"commandLine": "mkdir \"$AZ_BATCH_TASK_WORKING_DIR/thumbs\";sudo mkdir -m a=rwx -p \"/X\";sudo mount --rbind $AZ_BATCH_JOB_PREP_WORKING_DIR/assets /X;export maya_exec=[parameters('mayaVersion')].sh;export maya_exec=${{maya_exec,,}};$maya_exec -r sw [parameters('additionalFlags')] -proj \"$AZ_BATCH_JOB_PREP_WORKING_DIR\" -rd \"$AZ_BATCH_TASK_WORKING_DIR/images\" -s {0} -e {0} \"/X/[parameters('sceneFile')]\";err=$?;sudo umount \"/X\";exit $err",
"environmentSettings": [
{
"name": "MAYA_SCRIPT_PATH",

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-centos73",
"sku": "rendering",
"version": "1.0.8"
"version": "1.1.3"
},
"nodeAgentSKUId": "batch.node.centos 7"
}

Просмотреть файл

@ -17,6 +17,17 @@
"description": "The unique name of the job."
}
},
"mayaVersion": {
"type": "string",
"defaultValue": "Maya2018",
"metadata": {
"description": "The renderer to use"
},
"allowedValues":[
"Maya2017",
"Maya2018"
]
},
"inputData": {
"type": "string",
"metadata": {
@ -61,6 +72,10 @@
}
}
},
"variables":{
"Maya2017":"%MAYA_2017_EXEC%",
"Maya2018":"%MAYA_2018_EXEC%"
},
"job": {
"type": "Microsoft.Batch/batchAccounts/jobs",
"properties": {
@ -96,7 +111,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "mkdir \"%AZ_BATCH_TASK_WORKING_DIR%\\thumbs\" & subst X: %AZ_BATCH_JOB_PREP_WORKING_DIR%\\assets & render -renderer sw -proj \"%AZ_BATCH_JOB_PREP_WORKING_DIR%\" -rd \"%AZ_BATCH_TASK_WORKING_DIR%\\images\" -s {0} -e {0} \"X:\\[parameters('sceneFile')]\"",
"commandLine": "mkdir \"%AZ_BATCH_TASK_WORKING_DIR%\\thumbs\" & subst X: %AZ_BATCH_JOB_PREP_WORKING_DIR%\\assets & cmd.exe /v /c \"(if \"[parameters('mayaVersion')]\" == 'Maya2018' (SET MAYA_EXEC=%MAYA_2018_EXEC%) else (SET MAYA_EXEC=%MAYA_2017_EXEC%)) && !MAYA_EXEC! -renderer sw -proj \"%AZ_BATCH_JOB_PREP_WORKING_DIR%\" -rd \"%AZ_BATCH_TASK_WORKING_DIR%\\images\" -s {0} -e {0} \"X:\\[parameters('sceneFile')]\"\"",
"environmentSettings": [
{
"name": "MAYA_SCRIPT_PATH",

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-windows2016",
"sku": "rendering",
"version": "1.1.7"
"version": "1.2.3"
},
"nodeAgentSKUId": "batch.node.windows amd64"
}

Просмотреть файл

@ -17,6 +17,17 @@
"description": "The unique name of the job."
}
},
"mayaVersion": {
"type": "string",
"defaultValue": "Maya2018",
"metadata": {
"description": "The renderer to use"
},
"allowedValues":[
"Maya2017",
"Maya2018"
]
},
"inputData": {
"type": "string",
"metadata": {
@ -24,6 +35,13 @@
"advancedType": "file-group"
}
},
"additionalFlags": {
"type": "string",
"defaultValue": " ",
"metadata": {
"description": "Any additional flags to pass to the renderer. Example: -of png"
}
},
"sceneFile": {
"type": "string",
"metadata": {
@ -96,7 +114,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "mkdir \"$AZ_BATCH_TASK_WORKING_DIR/thumbs\";sudo mkdir -m a=rwx -p \"/X\";sudo mount --rbind $AZ_BATCH_JOB_PREP_WORKING_DIR/assets /X;Render -renderer vray -proj \"$AZ_BATCH_JOB_PREP_WORKING_DIR\" -rd \"$AZ_BATCH_TASK_WORKING_DIR/images\" -s {0} -e {0} \"/X/[parameters('sceneFile')]\";err=$?;sudo umount \"/X\";exit $err",
"commandLine": "mkdir \"$AZ_BATCH_TASK_WORKING_DIR/thumbs\";sudo mkdir -m a=rwx -p \"/X\";sudo mount --rbind $AZ_BATCH_JOB_PREP_WORKING_DIR/assets /X;export maya_exec=[parameters('mayaVersion')].sh;export maya_exec=${{maya_exec,,}};$maya_exec -r vray [parameters('additionalFlags')] -proj \"$AZ_BATCH_JOB_PREP_WORKING_DIR\" -rd \"$AZ_BATCH_TASK_WORKING_DIR/images\" -s {0} -e {0} \"/X/[parameters('sceneFile')]\";err=$?;sudo umount \"/X\";exit $err",
"environmentSettings": [
{
"name": "MAYA_SCRIPT_PATH",

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-centos73",
"sku": "rendering",
"version": "1.0.8"
"version": "1.1.3"
},
"nodeAgentSKUId": "batch.node.centos 7"
}

Просмотреть файл

@ -17,6 +17,17 @@
"description": "The unique name of the job."
}
},
"mayaVersion": {
"type": "string",
"defaultValue": "Maya2018",
"metadata": {
"description": "The renderer to use"
},
"allowedValues":[
"Maya2017",
"Maya2018"
]
},
"inputData": {
"type": "string",
"metadata": {
@ -61,6 +72,10 @@
}
}
},
"variables":{
"Maya2017":"%MAYA_2017_EXEC%",
"Maya2018":"%MAYA_2018_EXEC%"
},
"job": {
"type": "Microsoft.Batch/batchAccounts/jobs",
"properties": {
@ -96,7 +111,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "mkdir \"%AZ_BATCH_TASK_WORKING_DIR%\\thumbs\" & subst X: %AZ_BATCH_JOB_PREP_WORKING_DIR%\\assets & render -renderer vray -proj \"%AZ_BATCH_JOB_PREP_WORKING_DIR%\" -rd \"%AZ_BATCH_TASK_WORKING_DIR%\\images\" -s {0} -e {0} \"X:\\[parameters('sceneFile')]\"",
"commandLine": "mkdir \"%AZ_BATCH_TASK_WORKING_DIR%\\thumbs\" & subst X: %AZ_BATCH_JOB_PREP_WORKING_DIR%\\assets & cmd.exe /v /c \"(if \"[parameters('mayaVersion')]\" == 'Maya2018' (SET MAYA_EXEC=%MAYA_2018_EXEC%) else (SET MAYA_EXEC=%MAYA_2017_EXEC%)) && !MAYA_EXEC! -renderer vray -proj \"%AZ_BATCH_JOB_PREP_WORKING_DIR%\" -rd \"%AZ_BATCH_TASK_WORKING_DIR%\\images\" -s {0} -e {0} \"X:\\[parameters('sceneFile')]\"\"",
"environmentSettings": [
{
"name": "MAYA_SCRIPT_PATH",

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-windows2016",
"sku": "rendering",
"version": "1.1.7"
"version": "1.2.3"
},
"nodeAgentSKUId": "batch.node.windows amd64"
}

Просмотреть файл

@ -89,7 +89,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "sudo mkdir -m a=rwx $AZ_BATCH_TASK_WORKING_DIR/images;sudo mkdir -m a=rwx -p \"/X\";sudo mount --rbind $AZ_BATCH_JOB_PREP_WORKING_DIR/assets /X;source /etc/profile.d/chaos.sh;/usr/autodesk/mayaIO2017/vray/bin/vray -sceneFile=\"/X/[parameters('sceneFile')]\" -frames={0} -imgfile=\"$AZ_BATCH_TASK_WORKING_DIR/images/image{0}.png\" -display=0;err=$?;sudo umount \"/X\";exit $err",
"commandLine": "sudo mkdir -m a=rwx $AZ_BATCH_TASK_WORKING_DIR/images;sudo mkdir -m a=rwx -p \"/X\";sudo mount --rbind $AZ_BATCH_JOB_PREP_WORKING_DIR/assets /X;source /etc/profile.d/chaos.sh;vray2017.sh -sceneFile=\"/X/[parameters('sceneFile')]\" -frames={0} -imgfile=\"$AZ_BATCH_TASK_WORKING_DIR/images/image{0}.png\" -display=0;err=$?;sudo umount \"/X\";exit $err",
"outputFiles": [
{
"filePattern": "../stdout.txt",

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-centos73",
"sku": "rendering",
"version": "1.0.8"
"version": "1.1.2"
},
"nodeAgentSKUId": "batch.node.centos 7"
}

Просмотреть файл

@ -89,7 +89,7 @@
"elevationLevel": "admin"
}
},
"commandLine": "mkdir images & subst X: %AZ_BATCH_JOB_PREP_WORKING_DIR%\\assets & vray -sceneFile=\"X:\\[parameters('sceneFile')]\" -frames={0} -imgfile=\"%AZ_BATCH_TASK_WORKING_DIR%\\images\\image{0}.png\" -display=0",
"commandLine": "mkdir images & subst X: %AZ_BATCH_JOB_PREP_WORKING_DIR%\\assets & %VRAY_3.60.4_EXEC% -sceneFile=\"X:\\[parameters('sceneFile')]\" -frames={0} -imgfile=\"%AZ_BATCH_TASK_WORKING_DIR%\\images\\image{0}.png\" -display=0",
"outputFiles": [
{
"filePattern": "../stdout.txt",

Просмотреть файл

@ -97,7 +97,7 @@
"publisher": "batch",
"offer": "rendering-windows2016",
"sku": "rendering",
"version": "1.1.7"
"version": "1.2.3"
},
"nodeAgentSKUId": "batch.node.windows amd64"
}