diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/containerregistry_build.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/containerregistry_build.json index 577a8b9497d6..e5058fb8c3f3 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/containerregistry_build.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/containerregistry_build.json @@ -176,6 +176,9 @@ "x-ms-examples": { "Runs_List": { "$ref": "./examples/RunsList.json" + }, + "Runs_List_WithTimerTrigger": { + "$ref": "./examples/RunsList_WithTimerTrigger.json" } } } @@ -222,7 +225,10 @@ "x-ms-examples": { "Runs_Get": { "$ref": "./examples/RunsGet.json" - } + }, + "Runs_Get_WithTimerTrigger": { + "$ref": "./examples/RunsGet_WithTimerTrigger.json" + } } }, "patch": { @@ -837,6 +843,10 @@ "description": "The value that indicates whether archiving is enabled or not.", "default": false, "type": "boolean" + }, + "timerTrigger": { + "$ref": "#/definitions/TimerTriggerDescriptor", + "description": "The timer trigger that caused the run." } } }, @@ -918,6 +928,19 @@ } } }, + "TimerTriggerDescriptor": { + "type": "object", + "properties": { + "timerTriggerName": { + "description": "The timer trigger name that caused the run.", + "type": "string" + }, + "scheduleOccurrence": { + "description": "The occurrence that triggered the run.", + "type": "string" + } + } + }, "PlatformProperties": { "description": "The platform properties against which the run has to happen.", "required": [ @@ -2536,4 +2559,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemAndUserIdentities.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemAndUserIdentities.json index 55d33e171222..7d8e6eeb73f4 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemAndUserIdentities.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemAndUserIdentities.json @@ -16,7 +16,6 @@ "cpu": 2 }, "step": { - "type": "Docker", "imageNames": [ "azurerest:testtag" ], @@ -41,7 +40,7 @@ "timerTriggers": [ { "name": "myTimerTrigger", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -115,7 +114,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -194,7 +193,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemIdentity.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemIdentity.json index ecacc094b43b..463e251f63ae 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemIdentity.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemIdentity.json @@ -16,7 +16,6 @@ "cpu": 2 }, "step": { - "type": "Docker", "imageNames": [ "azurerest:testtag" ], @@ -41,7 +40,7 @@ "timerTriggers": [ { "name": "myTimerTrigger", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -112,7 +111,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -185,7 +184,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithUserIdentities.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithUserIdentities.json index af56f63c0947..bc6e30988154 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithUserIdentities.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithUserIdentities.json @@ -16,7 +16,6 @@ "cpu": 2 }, "step": { - "type": "Docker", "imageNames": [ "azurerest:testtag" ], @@ -41,7 +40,7 @@ "timerTriggers": [ { "name": "myTimerTrigger", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -116,7 +115,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -197,7 +196,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithKeyVaultCustomCredentials.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithKeyVaultCustomCredentials.json index c9d8a0133e2f..5c7ad4c2da65 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithKeyVaultCustomCredentials.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithKeyVaultCustomCredentials.json @@ -12,7 +12,6 @@ "cpu": 3 }, "step": { - "type": "Docker", "imageNames": [ "azurerest:testtag1" ], @@ -91,7 +90,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -170,7 +169,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithMSICustomCredentials.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithMSICustomCredentials.json index 98dc133a9493..7008d4a0dfb7 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithMSICustomCredentials.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithMSICustomCredentials.json @@ -12,7 +12,6 @@ "cpu": 3 }, "step": { - "type": "Docker", "imageNames": [ "azurerest:testtag1" ], @@ -83,7 +82,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -162,7 +161,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/RunsGet_WithTimerTrigger.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/RunsGet_WithTimerTrigger.json new file mode 100644 index 000000000000..85eef5839a2e --- /dev/null +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/RunsGet_WithTimerTrigger.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "subscriptionId": "4385cf00-2d3a-425a-832f-f4285b1c9dce", + "resourceGroupName": "myResourceGroup", + "registryName": "myRegistry", + "api-version": "2019-04-01", + "runId": "0accec26-d6de-4757-8e74-d080f38eaaab" + }, + "responses": { + "200": { + "body": { + "properties": { + "provisioningState": "Succeeded", + "runId": "0accec26-d6de-4757-8e74-d080f38eaaab", + "status": "Succeeded", + "lastUpdatedTime": "2018-01-25T05:13:51.617Z", + "runType": "AutoBuild", + "createTime": "2018-01-25T05:13:51.618Z", + "startTime": "2018-01-25T05:50:51.618Z", + "finishTime": "2018-01-25T06:13:51.618Z", + "outputImages": [ + { + "registry": "myregistry.azurecr.io", + "repository": "myimage", + "tag": "latest", + "digest": "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0" + } + ], + "task": "myTask", + "timerTrigger": { + "timerTriggerName": "myTimerTrigger", + "scheduleOccurrence": "6/4/2019 9:30 AM" + }, + "isArchiveEnabled": true, + "platform": { + "os": "Linux", + "architecture": "amd64" + }, + "agentConfiguration": { + "cpu": 2 + } + }, + "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab", + "name": "0accec26-d6de-4757-8e74-d080f38eaaab", + "type": "Microsoft.ContainerRegistry/registries/runs" + } + } + } +} diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/RunsList_WithTimerTrigger.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/RunsList_WithTimerTrigger.json new file mode 100644 index 000000000000..4282ec335c5f --- /dev/null +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/RunsList_WithTimerTrigger.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "subscriptionId": "4385cf00-2d3a-425a-832f-f4285b1c9dce", + "resourceGroupName": "myResourceGroup", + "registryName": "myRegistry", + "api-version": "2019-04-01", + "$filter": "", + "$top": 10 + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "provisioningState": "Succeeded", + "runId": "0accec26-d6de-4757-8e74-d080f38eaaab", + "status": "Succeeded", + "lastUpdatedTime": "2018-01-25T05:13:51.617Z", + "runType": "AutoBuild", + "createTime": "2018-01-25T05:13:51.618Z", + "startTime": "2018-01-25T05:50:51.618Z", + "finishTime": "2018-01-25T06:13:51.618Z", + "outputImages": [ + { + "registry": "myregistry.azurecr.io", + "repository": "myimage", + "tag": "latest", + "digest": "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0" + } + ], + "task": "myTask", + "timerTrigger": { + "timerTriggerName": "myTimerTrigger", + "scheduleOccurrence": "6/4/2019 9:30 AM" + }, + "isArchiveEnabled": true, + "platform": { + "os": "Linux", + "architecture": "amd64" + }, + "agentConfiguration": { + "cpu": 2 + } + }, + "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab", + "name": "0accec26-d6de-4757-8e74-d080f38eaaab", + "type": "Microsoft.ContainerRegistry/registries/runs" + } + ] + } + } + } +} diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksCreate.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksCreate.json index ecacc094b43b..463e251f63ae 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksCreate.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksCreate.json @@ -16,7 +16,6 @@ "cpu": 2 }, "step": { - "type": "Docker", "imageNames": [ "azurerest:testtag" ], @@ -41,7 +40,7 @@ "timerTriggers": [ { "name": "myTimerTrigger", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -112,7 +111,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -185,7 +184,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGet.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGet.json index df8612002c36..dae71cd78211 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGet.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGet.json @@ -42,7 +42,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGetDetails.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGetDetails.json index 90449313ea19..48c59368cbe1 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGetDetails.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGetDetails.json @@ -45,7 +45,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksList.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksList.json index 162b51ec2c9a..e5c5d8819827 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksList.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksList.json @@ -43,7 +43,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksUpdate.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksUpdate.json index f381cdd3da5b..0eaa3ae1b0dc 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksUpdate.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksUpdate.json @@ -12,7 +12,6 @@ "cpu": 3 }, "step": { - "type": "Docker", "imageNames": [ "azurerest:testtag1" ], @@ -91,7 +90,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -170,7 +169,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksUpdate_WithOpaqueCustomCredentials.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksUpdate_WithOpaqueCustomCredentials.json index d9e0f98a51f6..6ade61660c80 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksUpdate_WithOpaqueCustomCredentials.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksUpdate_WithOpaqueCustomCredentials.json @@ -12,7 +12,6 @@ "cpu": 3 }, "step": { - "type": "Docker", "imageNames": [ "azurerest:testtag1" ], @@ -90,7 +89,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [ @@ -169,7 +168,7 @@ { "name": "myTimerTrigger", "status": "Enabled", - "schedule": "0 30 9 * * 1-5" + "schedule": "30 9 * * 1-5" } ], "sourceTriggers": [