Skip to content

Commit

Permalink
Merge branch 'sonic-net:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
liuh-80 authored Jan 12, 2023
2 parents 25734fc + 3da9d36 commit 1fe2340
Show file tree
Hide file tree
Showing 211 changed files with 19,397 additions and 1,163 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ assignees: ''

---

**We do not triage issue for this repo. All issues are triaged in Azure/sonic-buildimage repo**
**We do not triage issue for this repo. All issues are triaged in sonic-net/sonic-buildimage repo**
2 changes: 1 addition & 1 deletion .github/workflows/sonic_image_links_create_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Run the shell script to generate sonic image links in sonic_image_links.js
# Run the script once in a minute. Github may take 15 minutes to run this even though we request once in a minute, which is OK.
on:
schedule:
- cron: '* * * * *'
- cron: '0 0 * * *'

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/supported_devices_platforms_md.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Run the shell script to generate sonic image links in supported_devices_pl
# Run the script once in a minute. Github may take 15 minutes to run this even though we request once in a minute, which is OK.
on:
schedule:
- cron: '5 * * * *'
- cron: '0 0 * * *'

jobs:
build:
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ For example:
* Use a pull request to do code review
* Use issues to keep track of what is going on

##Expectations for pull requests
Pull requests should be free of any known bugs and be accompanied by tests and appropriate documentation. Test coverage may include unit tests, integration tests such as [PTF tests](https://github.com/Azure/SONiC/wiki/HOWTO-write-a-PTF-Test) defined in the [sonic-mgmt repo](https://github.com/Azure/sonic-mgmt/tree/master/ansible/roles/test/tasks).
## Expectations for pull requests
Pull requests should be free of any known bugs and be accompanied by tests and appropriate documentation. Test coverage may include unit tests, integration tests such as [PTF tests](https://github.com/sonic-net/SONiC/wiki/HOWTO-write-a-PTF-Test) defined in the [sonic-mgmt repo](https://github.com/sonic-net/sonic-mgmt/tree/master/ansible/roles/test/tasks).

## Commiting new test
When commiting a new feature with a new test, please complete a [test plan from the template](doc/SONiC%20Test%20Plan%20Template.md)
When committing a new feature with a new test, please complete a [test plan from the template](doc/SONiC%20Test%20Plan%20Template.md)


##Responding to pull requests
## Responding to pull requests
Responsible individual: A contribution needs to be looked at by its
maintainers. In the absence of the maintainer, the project leader can respond.
A pull request should be responded to in approximately 48 hours. This does
not mean the contribution will be resolved in 48 hours. It could even mean
an email that states: “busy now, will get to it soon.”

##Contributors License Agreement
All contributors must sign a contribution license agreement before
contributions can be accepted. Send email to [sonic-cla](mailto:sonic-cla-agreements@microsoft.com)
to request a copy of the contributors a license agreement to be signed.
## Contributors License Agreement
All contributors must sign an [Individual Contributor License Agreement (ICLA)](https://docs.linuxfoundation.org/lfx/easycla/v2-current/contributors/individual-contributor) before
contributions can be accepted. This process is managed by the [Linux Foundation - EasyCLA](https://easycla.lfx.linuxfoundation.org/) and automated
via a GitHub bot. If the contributor has not yet signed a CLA, the bot will create a comment on the pull request containing a link to electronically sign the CLA.
55 changes: 55 additions & 0 deletions Github Project User Guide for SONiC Project.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Github Project User Guide for SONiC Project
Status: Drafting | Ready for Review | Reviewed

This document provides guidance to use Github project to track SONiC community release. Example is [SONiC 202305 Release](https://github.com/orgs/sonic-net/projects/8)

### Background
Before using Github project, SONiC community used [Google Sheet](https://docs.google.com/spreadsheets/u/0/d/19OkV0WjPcHVK6Xm_uq8dao8FjifP-MicbqEKvmpL8AA/edit) to track the community feature status which required the community leads to update the status periodically and manually. This google sheet is only visible to very limited audience, which is not convenient for others who want to check the release status.
By adopting Github project, we expect to <br>
1) Reduce the manual effort to update status, add PRs etc by leveraging the seamless integration between Github project and Github PR & Issue etc. <br>
2) Consolidate the release tracking to Github. <br>

The Github project is public to anyone who wants to check SONiC release status, no matter if you joined the SONiC community or not, but only limited audiences can edit.

### How to Use?
For people who have NO edit permission to this project but want to contribute, please follow the “Call for participation” message, e.g Re: [Call for participation for SONiC 202305 release](https://lists.sonicfoundation.dev/g/sonic-dev/message/46) (sonicfoundation.dev).
For people who can edit github project, if you want to propose a new feature from scratch, please refer to Sample Feature - PLEASE READ · [Issue #1125](https://github.com/sonic-net/SONiC/issues/1125)
<br>
1) On the "Table View" of project, click Control + Space and provide the Title <br>
2) Click “Enter” button to create a new work item. You can create new item from other views, but steps may be slightly different. <br>
3) Fulfill the fields in the ticket (click "Show all fields" to display all fields) <br>
* Mandatory fields when you submit proposal
* Title
* Short Description
* SAI Header (API) Change Required?
* Owner Company -- company name who proposed this feature. Please use your personal name if this comes from individual contributor
4) On the left side of the newly created item, click “Convert to issue”
5) Close the issue after the feature is delivered. The issue is used for project tracking purpose, please use HLD PR and code PRs to track the feature design and implementation.

If the HLD PR already exists, the PR can be added into the release plan by changing the “Projects” field of the PR. Please remember to update the fields info according to the Sample Feature above.

![Eg](images/user_guide_1.png)

### How to change the status?
There are two ways to update the status of one proposed feature.

##### Option 1: Drag & drop the feature to different slot on “Board View”

You can drag one feature to another slot to change the status.

![Option 1](images/user_guide_2.png)

##### Option 2: Change the “Status” field on the feature page

![Option 2](images/user_guide_3.png)

### Feature status change flow

1) A new feature proposal will by default go to “Backlog” slot. You can create new feature proposal for future releases in this slot.
2) Once you plan to contribute one specific feature to one specific release, say “SONiC 202305 Release”, you should move that feature to “In Plan Features” slot and leave a comment in the feature PR/Issue by saying “A feature target xxx release”. After this, team should start working on the HLD PR
3) Once the HLD is ready for review by community, the feature should be moved to “HLD Ready for Review” slot and specify an expected “HLD Review Date”. The weekly SONiC community meeting will be used for the HLD review. We will publish the community calendar with Google calendar later, before that, you can pick up a slot which is not booked yet on the project, or ask help from Yanzhao Zhang
4) After the HLD is reviewed in SONiC community, the feature should be moved to “In Progress” slot. Team should update the HLD based on the community feedbacks while working on the code PRs. Code PRs need be added to HLD PR by referring to Pull Request [#806](https://github.com/sonic-net/SONiC/pull/806)
5) Later, after all code PRs and HLD PR are merged, the feature should be moved to “Done” slot.
6) If one feature need be deferred or withdrawn, the feature should be moved to “Deferred” slot (candidate for next release), or “Backlog” slot (candidate for future releases post next release).


Loading

0 comments on commit 1fe2340

Please sign in to comment.