Skip to content

Commit

Permalink
Revert "[Fleet] 2024-02-02-preview resolve conflicts (#27767)" (#27814)
Browse files Browse the repository at this point in the history
This reverts commit 662d6d6.

Co-authored-by: Allen Zhang <[email protected]>
  • Loading branch information
zman-ms and allenjzhang authored Feb 17, 2024
1 parent 662d6d6 commit 1ded9f2
Show file tree
Hide file tree
Showing 4,008 changed files with 19,573 additions and 646,824 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
46 changes: 0 additions & 46 deletions .github/ISSUE_TEMPLATE/01_question.yml

This file was deleted.

76 changes: 0 additions & 76 deletions .github/ISSUE_TEMPLATE/02_bug.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/ISSUE_TEMPLATE/03_feature_request.yml

This file was deleted.

35 changes: 18 additions & 17 deletions .github/PULL_REQUEST_TEMPLATE/control_plane_template.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# ARM (Control Plane) API Specification Update Pull Request

> [!TIP]
> Overwhelmed by all this guidance? See the `Getting help` section at the bottom of this PR description.
> [!NOTE]
> As of January 2024 there is no PR assignee. This is expected. See https://aka.ms/azsdk/pr-arm-review.
> Tip: overwhelmed by all this guidance? See the `Getting help` section at the bottom of this PR description.
## PR review workflow diagram

Expand All @@ -31,7 +27,9 @@ If the automation determines you have breaking changes, i.e. Step 1 from the dia

### ARM API changes review (Diagram Step 2)

- For help with Step 2 / "ARM review", see https://aka.ms/azsdk/pr-arm-review.
- If this PR is in purview of ARM review then automation will add the `ARMReview` label.
- If you want to force ARM review, add the label yourself.
- Proceed according to the diagram at the top of this comment.

</details>

Expand All @@ -40,20 +38,23 @@ If the automation determines you have breaking changes, i.e. Step 1 from the dia

### Diagram footnotes

[1] See [ARM review queue] (for **PR merge** queues, see [2]).
[2] [public repo merge queue], [private repo merge queue] (for **ARM review** queue, [1])
The ARM reviewer on-call engineer visits the merge queue twice a day, so the approximate ETA for merges is 12 - 24 hours.
[1] [ARM review queue] (for **merge** queues, see [2])
The PRs are processed by time opened, ascending. Your PR may show up on 2nd or later page.
If you addressed Step 1 from the diagram and your PR is not showing up in the queue, ensure the label `ARMChangesRequested`
is removed from your PR. This should cause the label `WaitForARMFeedback` to be added.
[2] [public repo merge queue], [private repo merge queue] (for **ARM review** queue, [1])

If you need further help with anything, see `Getting help` section below.

</details>

## Purpose of this PR

What's the purpose of this PR? Check the specific option that applies. This is **mandatory**!
What's the purpose of this PR? Check all that apply. This is **mandatory**!

- [ ] New resource provider.
- [ ] New API version for an existing resource provider. (If API spec is not defined in TypeSpec, the PR should have been generated using [OpenAPI Hub](https://aka.ms/openapihub)).
- [ ] New API version. (If API spec is not defined in TypeSpec, the PR should have been generated using [OpenAPI Hub](https://aka.ms/openapihub)).
- [ ] Update existing version for a new feature. (This is applicable only when you are revising a private preview API version.)
- [ ] Update existing version to fix OpenAPI spec quality issues in S360.
- [ ] Update existing version to fix swagger quality issues in S360.
- [ ] Other, please clarify:
- _edit this with your clarification_

Expand All @@ -66,7 +67,7 @@ and followed the instructions by checking all the boxes:
- [ ] I have reviewed following [Resource Provider guidelines](https://aka.ms/rpguidelines), including
[ARM resource provider contract](https://github.com/Azure/azure-resource-manager-rpc) and
[REST guidelines](https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md) (estimated time: 4 hours).
I understand this is required before I can proceed to the diagram Step 2, "ARM API changes review", for this PR.
I understand this is required before I can proceed to the Diagram Step 2, "ARM API changes Review", for this PR.

## Additional information

Expand All @@ -81,7 +82,8 @@ in the `Generated ApiView` comment added to this PR. You can use ApiView to show
<summary>Suppressing failures</summary>

If one or multiple validation error/warning suppression(s) is detected in your PR, please follow the
[suppressions guide](https://aka.ms/azsdk/pr-suppressions) to get approval.
[Swagger-Suppression-Process](https://aka.ms/azsdk/pr-suppressions)
to get approval.

</details>

Expand All @@ -91,12 +93,11 @@ If one or multiple validation error/warning suppression(s) is detected in your P
- To understand what you must do next to merge this PR, see the `Next Steps to Merge` comment. It will appear within few minutes of submitting this PR and will continue to be up-to-date with current PR state.
- For guidance on fixing this PR CI check failures, see the hyperlinks provided in given failure
and https://aka.ms/ci-fix.
- For help with PR workflow diagram Step 2 (ARM review), see https://aka.ms/azsdk/pr-arm-review.
- If the PR CI checks appear to be stuck in `queued` state, please add a comment with contents `/azp run`.
This should result in a new comment denoting a `PR validation pipeline` has started and the checks should be updated after few minutes.
- If the help provided by the previous points is not enough, post to https://aka.ms/azsdk/support/specreview-channel and link to this PR.

[ARM review queue]: https://aka.ms/azsdk/pr-arm-review#about-the-arm-review-queue
[ARM review queue]: https://github.com/search?q=org%3AAzure+is%3Apr+is%3Aopen+label%3AWaitForARMFeedback+-label%3AIDCDevDiv++draft%3Afalse+sort%3Acreated-asc+&type=pullrequests
[public repo merge queue]: https://github.com/Azure/azure-rest-api-specs/pulls?q=is%3Aopen+is%3Apr+label%3AMergeRequested+draft%3Afalse+sort%3Acreated-asc
[private repo merge queue]: https://github.com/Azure/azure-rest-api-specs-pr/pulls?q=is%3Aopen+is%3Apr+label%3AMergeRequested+-label%3AApproved-OkToMerge+draft%3Afalse+sort%3Acreated-asc
[breaking changes process]: https://eng.ms/docs/cloud-ai-platform/azure-core/azure-core-pm-and-design/trusted-platform-pm-karimb/service-lifecycle-and-actions-team/service-lifecycle-actions-team/apex/media/launchingproductbreakingchanges#breaking-change-process-1
10 changes: 10 additions & 0 deletions .github/comment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
---
- rule:
type: label
label: "CI-MissingBaseCommit"
onLabeledComments: >-
Hi @${PRAuthor}! For review efficiency consideration,
when creating a new API version, it is required to place API specs of the
base version in the first commit, and push new version updates into successive commits.
You can use OpenAPIHub to initialize the PR for adding a new version. <br/>
For more details refer to the [wiki](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/208/OpenAPI-Hub-Adding-new-API-version).
- rule:
type: label
repoAllowList:
Expand Down
6 changes: 6 additions & 0 deletions .github/issue_assignment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
- rule:
booleanFilterExpression: "APIStewardshipBoard-ReviewRequested"
assignees:


Loading

0 comments on commit 1ded9f2

Please sign in to comment.