Make deploy script path relative to package path and do not copy scri…

Tasks/PackerBuild/DefaultTemplates/custom.linux.template.json

@@ -9,8 +9,7 @@
     "storage_account": "{{env `storage_account`}}",
     "image_url": "{{env `image_url`}}",
     "location": "{{env `location`}}",
-    "script_path": "{{env `script_path`}}",
-    "script_name": "{{env `script_name`}}",
+    "script_relative_path": "{{env `script_relative_path`}}",
     "script_arguments": "{{env `script_arguments`}}",
     "package_path": "{{env `package_path`}}",
     "package_name": "{{env `package_name`}}",
@@ -43,11 +42,6 @@
             "chmod 777 /deployTemp"
         ]
     },
-    {
-        "type": "file",
-        "source": "{{user `script_path`}}",
-        "destination": "/deployTemp/{{user `script_name`}}"
-    },
     {
         "type": "file",
         "source": "{{user `package_path`}}",
@@ -59,8 +53,8 @@
         "inline": [
             "cd /deployTemp",
             "ls",
-            "chmod +x /deployTemp/{{user `script_name`}}",
-            "/deployTemp/{{user `script_name`}} {{user `script_arguments`}}"
+            "chmod +x /deployTemp/{{user `package_name`}}/{{user `script_relative_path`}}",
+            "/deployTemp/{{user `package_name`}}/{{user `script_relative_path`}} {{user `script_arguments`}}"
         ]
     },
     {

Tasks/PackerBuild/DefaultTemplates/custom.windows.template.json

@@ -9,8 +9,7 @@
     "storage_account": "{{env `storage_account`}}",
     "image_url": "{{env `image_url`}}",
     "location": "{{env `location`}}",
-    "script_path": "{{env `script_path`}}",
-    "script_name": "{{env `script_name`}}",
+    "script_relative_path": "{{env `script_relative_path`}}",
     "script_arguments": "{{env `script_arguments`}}",
     "package_path": "{{env `package_path`}}",
     "package_name": "{{env `package_name`}}",
@@ -47,11 +46,6 @@
                 "cmd /c \"mkdir c:\\\\DeployTemp\""
             ]
         },
-        {
-            "type": "file",
-            "source": "{{user `script_path`}}",
-            "destination": "c:\\DeployTemp\\{{user `script_name`}}"
-        },
         {
             "type": "file",
             "source": "{{user `package_path`}}",
@@ -62,7 +56,7 @@
             "inline": [
                 "cd \"C:\\DeployTemp\"",
                 "ls",
-                "C:\\DeployTemp\\{{user `script_name`}} {{user `script_arguments`}}"
+                "C:\\DeployTemp\\{{user `package_name`}}\\{{user `script_relative_path`}} {{user `script_arguments`}}"
             ]
         },
         {

Tasks/PackerBuild/DefaultTemplates/default.linux.template.json

@@ -11,8 +11,7 @@
     "image_offer": "",
     "image_sku": "",
     "location": "",
-    "script_path": "",
-    "script_name": "",
+    "script_relative_path": "",
     "script_arguments": "",
     "package_path": "",
     "package_name": "",
@@ -47,11 +46,6 @@
             "chmod 777 /deployTemp"
         ]
     },
-    {
-        "type": "file",
-        "source": "{{user `script_path`}}",
-        "destination": "/deployTemp/{{user `script_name`}}"
-    },
     {
         "type": "file",
         "source": "{{user `package_path`}}",
@@ -63,8 +57,8 @@
         "inline": [
             "cd /deployTemp",
             "ls",
-            "chmod +x /deployTemp/{{user `script_name`}}",
-            "/deployTemp/{{user `script_name`}} {{user `script_arguments`}}"
+            "chmod +x /deployTemp/{{user `package_name`}}/{{user `script_relative_path`}}",
+            "/deployTemp/{{user `package_name`}}/{{user `script_relative_path`}} {{user `script_arguments`}}"
         ]
     },
     {

Tasks/PackerBuild/DefaultTemplates/default.windows.template.json

@@ -11,8 +11,7 @@
     "image_offer": "",
     "image_sku": "",
     "location": "",
-    "script_path": "",
-    "script_name": "",
+    "script_relative_path": "",
     "script_arguments": "",
     "package_path": "",
     "package_name": "",
@@ -51,11 +50,6 @@
                 "cmd /c \"mkdir c:\\\\DeployTemp\""
             ]
         },
-        {
-            "type": "file",
-            "source": "{{user `script_path`}}",
-            "destination": "c:\\DeployTemp\\{{user `script_name`}}"
-        },
         {
             "type": "file",
             "source": "{{user `package_path`}}",
@@ -66,7 +60,7 @@
             "inline": [
                 "cd \"C:\\DeployTemp\"",
                 "ls",
-                "C:\\DeployTemp\\{{user `script_name`}} {{user `script_arguments`}}"
+                "C:\\DeployTemp\\{{user `package_name`}}\\{{user `script_relative_path`}} {{user `script_arguments`}}"
             ]
         },
         {

Tasks/PackerBuild/Strings/resources.resjson/en-US/resources.resjson

@@ -28,7 +28,7 @@
   "loc.input.label.packagePath": "Application Package/folder",
   "loc.input.help.packagePath": "Specify the path for application package relative to $(System.DefaultWorkingDirectory). Supports minimatch pattern.",
   "loc.input.label.deployScriptPath": "Deployment script",
-  "loc.input.help.deployScriptPath": "Specify the path to powershell or shell script which deploys provided application package. Path should be relative to relative to $(System.DefaultWorkingDirectory). Supports minimatch pattern.",
+  "loc.input.help.deployScriptPath": "Specify the relative path to powershell script(for windows VMSS) or shell script(for linux VMSS) which deploys provided application package. Path should be relative to package path selected above. Supports minimatch pattern.",
   "loc.input.label.deployScriptArguments": "Deployment script arguments",
   "loc.input.help.deployScriptArguments": "Specify the arguments to be passed to deployment script.",
   "loc.input.label.imageUri": "Image URL",

Tasks/PackerBuild/Tests/L0Linux.ts

@@ -11,8 +11,8 @@ tr.setInput('storageAccountName', 'teststorage');
 tr.setInput('baseImageSource', 'default');
 tr.setInput('baseImage', 'Canonical:UbuntuServer:14.04.4-LTS:linux');
 tr.setInput('location', 'South India');
-tr.setInput('packagePath', '/packer-user-scripts/dummy.tar.gz');
-tr.setInput('deployScriptPath', '/packer-user-scripts/deploy.sh');
+tr.setInput('packagePath', 'dir1/**/dir2');
+tr.setInput('deployScriptPath', 'dir3/**/deploy.sh');
 tr.setInput('deployScriptArguments', "\"subdir 1\" false");
 tr.setInput('ConnectedServiceName', 'AzureRMSpn');
 tr.setInput('imageUri', 'imageUri');
@@ -43,23 +43,23 @@ let a: any = <any>{
             "code": 0,
             "stdout": "{ \"some-key\": \"some-value\" }"
         },
-        "packer validate -var resource_group=testrg -var storage_account=teststorage -var image_publisher=Canonical -var image_offer=UbuntuServer -var image_sku=14.04.4-LTS -var location=South India -var capture_name_prefix=Release-1 -var script_path=/packer-user-scripts/deploy.sh -var script_name=deploy.sh -var package_path=/packer-user-scripts/dummy.tar.gz -var package_name=dummy.tar.gz -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId /tmp/tempdir/100/default.linux.template-fixed.json": {
+        "packer validate -var resource_group=testrg -var storage_account=teststorage -var image_publisher=Canonical -var image_offer=UbuntuServer -var image_sku=14.04.4-LTS -var location=South India -var capture_name_prefix=Release-1 -var script_relative_path=dir3/somedir/deploy.sh -var package_path=/tmp/dir1/somedir/dir2 -var package_name=dir2 -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId /tmp/tempdir/100/default.linux.template-fixed.json": {
             "code": 0,
             "stdout": "Executed Successfully"
         },
-        "packer build -force -var resource_group=testrg -var storage_account=teststorage -var image_publisher=Canonical -var image_offer=UbuntuServer -var image_sku=14.04.4-LTS -var location=South India -var capture_name_prefix=Release-1 -var script_path=/packer-user-scripts/deploy.sh -var script_name=deploy.sh -var package_path=/packer-user-scripts/dummy.tar.gz -var package_name=dummy.tar.gz -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId /tmp/tempdir/100/default.linux.template-fixed.json": {
+        "packer build -force -var resource_group=testrg -var storage_account=teststorage -var image_publisher=Canonical -var image_offer=UbuntuServer -var image_sku=14.04.4-LTS -var location=South India -var capture_name_prefix=Release-1 -var script_relative_path=dir3/somedir/deploy.sh -var package_path=/tmp/dir1/somedir/dir2 -var package_name=dir2 -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId /tmp/tempdir/100/default.linux.template-fixed.json": {
             "code": process.env["__packer_build_fails__"] === "true" ? 1 : 0,
             "stdout": process.env["__packer_build_fails__"] === "true" ? "packer build failed\r\nsome error" : "Executed Successfully\nOSDiskUri: https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/packer/packer-osDisk.e2e08a75-2d73-49ad-97c2-77f8070b65f5.vhd\nStorageAccountLocation: SouthIndia",
         },
         "packer fix -validate=false \\tmp\\tempdir\\100\\default.linux.template.json": {
             "code": 0,
             "stdout": "Executed Successfully"
         },
-        "packer validate -var resource_group=testrg -var storage_account=teststorage -var image_publisher=Canonical -var image_offer=UbuntuServer -var image_sku=14.04.4-LTS -var location=South India -var capture_name_prefix=Release-1 -var script_path=/packer-user-scripts/deploy.sh -var script_name=deploy.sh -var package_path=/packer-user-scripts/dummy.tar.gz -var package_name=dummy.tar.gz -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId \\tmp\\tempdir\\100\\default.linux.template-fixed.json": {
+        "packer validate -var resource_group=testrg -var storage_account=teststorage -var image_publisher=Canonical -var image_offer=UbuntuServer -var image_sku=14.04.4-LTS -var location=South India -var capture_name_prefix=Release-1 -var script_relative_path=dir3/somedir/deploy.sh -var package_path=/tmp/dir1/somedir/dir2 -var package_name=dir2 -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId \\tmp\\tempdir\\100\\default.linux.template-fixed.json": {
             "code": 0,
             "stdout": "Executed Successfully"
         },
-        "packer build -force -var resource_group=testrg -var storage_account=teststorage -var image_publisher=Canonical -var image_offer=UbuntuServer -var image_sku=14.04.4-LTS -var location=South India -var capture_name_prefix=Release-1 -var script_path=/packer-user-scripts/deploy.sh -var script_name=deploy.sh -var package_path=/packer-user-scripts/dummy.tar.gz -var package_name=dummy.tar.gz -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId \\tmp\\tempdir\\100\\default.linux.template-fixed.json": {
+        "packer build -force -var resource_group=testrg -var storage_account=teststorage -var image_publisher=Canonical -var image_offer=UbuntuServer -var image_sku=14.04.4-LTS -var location=South India -var capture_name_prefix=Release-1 -var script_relative_path=dir3/somedir/deploy.sh -var package_path=/tmp/dir1/somedir/dir2 -var package_name=dir2 -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId \\tmp\\tempdir\\100\\default.linux.template-fixed.json": {
             "code": process.env["__packer_build_fails__"] === "true" ? 1 : 0,
             "stdout": process.env["__packer_build_fails__"] === "true" ? "packer build failed\r\nsome error" : "Executed Successfully\nOSDiskUri: https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/packer/packer-osDisk.e2e08a75-2d73-49ad-97c2-77f8070b65f5.vhd\nStorageAccountLocation: SouthIndia",
         }
@@ -94,7 +94,11 @@ tr.registerMock('./utilities', {
         console.log("writing to file " + filePath + " content: " + content);
     },
     findMatch: function(root: string, patterns: string[] | string) {
-        return [patterns];
+        if(root === undefined) {
+            return ["/tmp/dir1/somedir/dir2"];
+        } else {
+            return ["/tmp/dir1/somedir/dir2/dir3/somedir/deploy.sh"];            
+        }
     },
     getCurrentTime: function() {
         return 100;

Tasks/PackerBuild/Tests/L0LinuxCustomImage.ts

@@ -12,8 +12,8 @@ tr.setInput('baseImageSource', 'customVhd');
 tr.setInput('customImageUrl', 'https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd');
 tr.setInput('customImageOSType', 'linux');
 tr.setInput('location', 'South India');
-tr.setInput('packagePath', '/packer-user-scripts/dummy.tar.gz');
-tr.setInput('deployScriptPath', '/packer-user-scripts/deploy.sh');
+tr.setInput('packagePath', 'dir1/**/dir2');
+tr.setInput('deployScriptPath', 'dir3/**/deploy.sh');
 tr.setInput('deployScriptArguments', "\"subdir 1\" false");
 tr.setInput('ConnectedServiceName', 'AzureRMSpn');
 tr.setInput('imageUri', 'imageUri');
@@ -44,23 +44,23 @@ let a: any = <any>{
             "code": 0,
             "stdout": "{ \"some-key\": \"some-value\" }"
         },
-        "packer validate -var resource_group=testrg -var storage_account=teststorage -var image_url=https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd -var location=South India -var capture_name_prefix=Release-1 -var script_path=/packer-user-scripts/deploy.sh -var script_name=deploy.sh -var package_path=/packer-user-scripts/dummy.tar.gz -var package_name=dummy.tar.gz -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId /tmp/tempdir/100/custom.linux.template-fixed.json": {
+        "packer validate -var resource_group=testrg -var storage_account=teststorage -var image_url=https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd -var location=South India -var capture_name_prefix=Release-1 -var script_relative_path=dir3/somedir/deploy.sh -var package_path=/tmp/dir1/somedir/dir2 -var package_name=dir2 -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId /tmp/tempdir/100/custom.linux.template-fixed.json": {
             "code": 0,
             "stdout": "Executed Successfully"
         },
-        "packer build -force -var resource_group=testrg -var storage_account=teststorage -var image_url=https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd -var location=South India -var capture_name_prefix=Release-1 -var script_path=/packer-user-scripts/deploy.sh -var script_name=deploy.sh -var package_path=/packer-user-scripts/dummy.tar.gz -var package_name=dummy.tar.gz -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId /tmp/tempdir/100/custom.linux.template-fixed.json": {
+        "packer build -force -var resource_group=testrg -var storage_account=teststorage -var image_url=https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd -var location=South India -var capture_name_prefix=Release-1 -var script_relative_path=dir3/somedir/deploy.sh -var package_path=/tmp/dir1/somedir/dir2 -var package_name=dir2 -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId /tmp/tempdir/100/custom.linux.template-fixed.json": {
             "code": process.env["__packer_build_fails__"] === "true" ? 1 : 0,
             "stdout": process.env["__packer_build_fails__"] === "true" ? "packer build failed\r\nsome error" : "Executed Successfully\nOSDiskUri: https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/packer/packer-osDisk.e2e08a75-2d73-49ad-97c2-77f8070b65f5.vhd\nStorageAccountLocation: SouthIndia",
         },
         "packer fix -validate=false \\tmp\\tempdir\\100\\custom.linux.template.json": {
             "code": 0,
             "stdout": "Executed Successfully"
         },
-        "packer validate -var resource_group=testrg -var storage_account=teststorage -var image_url=https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd -var location=South India -var capture_name_prefix=Release-1 -var script_path=/packer-user-scripts/deploy.sh -var script_name=deploy.sh -var package_path=/packer-user-scripts/dummy.tar.gz -var package_name=dummy.tar.gz -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId \\tmp\\tempdir\\100\\custom.linux.template-fixed.json": {
+        "packer validate -var resource_group=testrg -var storage_account=teststorage -var image_url=https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd -var location=South India -var capture_name_prefix=Release-1 -var script_relative_path=dir3/somedir/deploy.sh -var package_path=/tmp/dir1/somedir/dir2 -var package_name=dir2 -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId \\tmp\\tempdir\\100\\custom.linux.template-fixed.json": {
             "code": 0,
             "stdout": "Executed Successfully"
         },
-        "packer build -force -var resource_group=testrg -var storage_account=teststorage -var image_url=https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd -var location=South India -var capture_name_prefix=Release-1 -var script_path=/packer-user-scripts/deploy.sh -var script_name=deploy.sh -var package_path=/packer-user-scripts/dummy.tar.gz -var package_name=dummy.tar.gz -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId \\tmp\\tempdir\\100\\custom.linux.template-fixed.json": {
+        "packer build -force -var resource_group=testrg -var storage_account=teststorage -var image_url=https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-1-osDisk.2d175222-b257-405f-a07f-0af4dc4b3dc4.vhd -var location=South India -var capture_name_prefix=Release-1 -var script_relative_path=dir3/somedir/deploy.sh -var package_path=/tmp/dir1/somedir/dir2 -var package_name=dir2 -var script_arguments=\"subdir 1\" false -var subscription_id=sId -var client_id=spId -var client_secret=spKey -var tenant_id=tenant -var object_id=oId \\tmp\\tempdir\\100\\custom.linux.template-fixed.json": {
             "code": process.env["__packer_build_fails__"] === "true" ? 1 : 0,
             "stdout": process.env["__packer_build_fails__"] === "true" ? "packer build failed\r\nsome error" : "Executed Successfully\nOSDiskUri: https://bishalpackerimages.blob.core.windows.net/system/Microsoft.Compute/Images/packer/packer-osDisk.e2e08a75-2d73-49ad-97c2-77f8070b65f5.vhd\nStorageAccountLocation: SouthIndia",
         }
@@ -99,7 +99,11 @@ tr.registerMock('./utilities', {
         console.log("writing to file " + filePath + " content: " + content);
     },
     findMatch: function(root: string, patterns: string[] | string) {
-        return [patterns];
+        if(root === undefined) {
+            return ["/tmp/dir1/somedir/dir2"];
+        } else {
+            return ["/tmp/dir1/somedir/dir2/dir3/somedir/deploy.sh"];            
+        }
     },
     getCurrentTime: function() {
         return 100;