Skip to content

Commit 549ecb9

Browse files
author
himanshu yadav
authored
Users/hiyada/packer build task fix port m145 (#9114)
* Not deleting the template file directory for user provided template. * bumped up the task version * ported changes to v0 packer build task as well.
1 parent 78e2b62 commit 549ecb9

File tree

6 files changed

+33
-22
lines changed

6 files changed

+33
-22
lines changed

Tasks/PackerBuildV0/src/customTemplateFileProvider.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ export default class CustomTemplateFileProvider extends TemplateFileProviderBase
2828
tl.checkPath(initialTemplateFileLocation, tl.loc("CustomTemplateNotFoundErrorMessagePathName", initialTemplateFileLocation));
2929

3030
this._templateFileLocation = initialTemplateFileLocation;
31-
return this._templateFileLocation;
31+
return this._templateFileLocation;
32+
}
33+
34+
public cleanup(): void {
35+
// do not delete in case of user provided template.
3236
}
3337
}

Tasks/PackerBuildV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 0,
17-
"Patch": 18
17+
"Patch": 19
1818
},
1919
"demands": [],
2020
"minimumAgentVersion": "2.0.0",

Tasks/PackerBuildV0/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 0,
17-
"Patch": 16
17+
"Patch": 19
1818
},
1919
"demands": [],
2020
"minimumAgentVersion": "2.0.0",

Tasks/PackerBuildV1/src/customTemplateFileProvider.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@ export default class CustomTemplateFileProvider extends TemplateFileProviderBase
3030
this._templateFileLocation = initialTemplateFileLocation;
3131
return this._templateFileLocation;
3232
}
33-
}
33+
34+
public cleanup(): void {
35+
// do not delete in case of user provided template.
36+
}
37+
}

Tasks/PackerBuildV1/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 0,
17-
"Patch": 2
17+
"Patch": 3
1818
},
1919
"demands": [],
2020
"preview": "true",

Tasks/PackerBuildV1/task.loc.json

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 0,
17-
"Patch": 0
17+
"Patch": 3
1818
},
1919
"demands": [],
2020
"preview": "true",
@@ -57,22 +57,6 @@
5757
},
5858
"defaultValue": "builtin"
5959
},
60-
{
61-
"name": "isManagedImage",
62-
"type": "boolean",
63-
"label": "ms-resource:loc.input.label.isManagedImage",
64-
"required": true,
65-
"helpMarkDown": "ms-resource:loc.input.help.isManagedImage",
66-
"defaultValue": true
67-
},
68-
{
69-
"name": "managedImageName",
70-
"type": "string",
71-
"label": "ms-resource:loc.input.label.managedImageName",
72-
"required": true,
73-
"helpMarkDown": "ms-resource:loc.input.help.managedImageName",
74-
"visibleRule": "isManagedImage = true && templateType = builtin"
75-
},
7660
{
7761
"name": "customTemplateLocation",
7862
"type": "filePath",
@@ -101,6 +85,24 @@
10185
"helpMarkDown": "ms-resource:loc.input.help.ConnectedServiceName",
10286
"groupName": "AzureDetails"
10387
},
88+
{
89+
"name": "isManagedImage",
90+
"type": "boolean",
91+
"label": "ms-resource:loc.input.label.isManagedImage",
92+
"required": true,
93+
"helpMarkDown": "ms-resource:loc.input.help.isManagedImage",
94+
"defaultValue": true,
95+
"groupName": "AzureDetails"
96+
},
97+
{
98+
"name": "managedImageName",
99+
"type": "string",
100+
"label": "ms-resource:loc.input.label.managedImageName",
101+
"required": true,
102+
"helpMarkDown": "ms-resource:loc.input.help.managedImageName",
103+
"visibleRule": "isManagedImage = true",
104+
"groupName": "AzureDetails"
105+
},
104106
{
105107
"name": "location",
106108
"type": "pickList",
@@ -293,6 +295,7 @@
293295
"PackerBuildCompleted": "ms-resource:loc.messages.PackerBuildCompleted",
294296
"ImageURIOutputVariableNotFound": "ms-resource:loc.messages.ImageURIOutputVariableNotFound",
295297
"ManagedImageNameOutputVariableNotFound": "ms-resource:loc.messages.ManagedImageNameOutputVariableNotFound",
298+
"CustumTemplateOutputVariableNotFound": "ms-resource:loc.messages.CustumTemplateOutputVariableNotFound",
296299
"BuiltInTemplateNotFoundErrorMessagePathName": "ms-resource:loc.messages.BuiltInTemplateNotFoundErrorMessagePathName",
297300
"CustomTemplateNotFoundErrorMessagePathName": "ms-resource:loc.messages.CustomTemplateNotFoundErrorMessagePathName",
298301
"CouldNotDeleteTemporaryTemplateDirectory": "ms-resource:loc.messages.CouldNotDeleteTemporaryTemplateDirectory",

0 commit comments

Comments
 (0)