Merge branch 'master' into users/shmittal/CreatingBlob

microsoft · May 8, 2020 · d1e8428 · d1e8428
2 parents c12dbaf + 0576ac4
commit d1e8428
Show file tree

Hide file tree

Showing 36 changed files with 1,740 additions and 156 deletions.
diff --git a/Tasks/ACRTaskV0/Strings/resources.resjson/en-US/resources.resjson b/Tasks/ACRTaskV0/Strings/resources.resjson/en-US/resources.resjson
@@ -35,6 +35,8 @@
   "loc.input.help.architecture": "Architecture",
   "loc.input.label.cwd": "Working Directory",
   "loc.input.help.cwd": "Current working directory where the script(not ACR) is run.  Empty is the root of the repo (build) or artifacts (release), which is $(System.DefaultWorkingDirectory)",
+  "loc.input.label.pat": "PAT for updating the baseimage trigger",
+  "loc.input.help.pat": "This PAT would be passed down to the baseImageTrigger field to trigger this pipeline whenever the base image is updated",
   "loc.messages.InvalidEndpointAuthScheme": "Invalid GitHub service connection scheme: %s. Only Token, OAuth and GitHub personal access token connections are allowed.",
   "loc.messages.InvalidGithubEndpoint": "Invalid GitHub service endpoint: %s.",
   "loc.messages.TaskConstructorFailed": "Task failed while initializing. Error: %s",

diff --git a/Tasks/ACRTaskV0/models/acrtaskrequestbody.ts b/Tasks/ACRTaskV0/models/acrtaskrequestbody.ts
@@ -63,6 +63,8 @@ export interface IBaseImageTrigger {
 	status: string;
 	baseImageTriggerType: string;
 	name: string;
+	updateTriggerEndpoint: string;
+	updateTriggerPayloadType: string;
 }
 
 export interface ITrigger {