Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add platform cisco-8000 to platform path #7821

Closed
wants to merge 3 commits into from
Closed

Add platform cisco-8000 to platform path #7821

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27a2838
Add platform cisco-8000 to platform path
VenkatCisco Jun 8, 2021
109cc7b
remove rules.mk.swp file
VenkatCisco Jun 9, 2021
f7be554
add ability to do check out a commit id
VenkatCisco Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions platform/cisco-8000/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
##############################################################
## Top level platform rules.mk
##############################################################
CISCO_PLATFORM_BRANCH := cisco-8000/master
CISCO_PLATFORM_URL := https://$(GITUSER):$(GITTOKEN)@Cisco-sonic-8000/platform-cisco-8000.git
CISCO_PLATFORM_SRC=$(PLATFORM_PATH)/src
CISCO_8000_SHA1 := f224715

$(shell if [ ! -d $(CISCO_PLATFORM_SRC) ]; then git clone -b $(CISCO_PLATFORM_BRANCH) $(CISCO_PLATFORM_URL) $(CISCO_PLATFORM_SRC); fi)
Copy link
Collaborator

@xumia xumia Jun 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd better to clone a specific commit id/tag, not branch, for version control.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. CISCO_PLATFORM_BRANCH Is a configureable variable. This is the first commit that brings in cisco-8000 platform into sonic-buildimage repo hence its pointing to the head of the branch. This is eventually going to be controlled by MSFT that reflects the correct commit id of the platform code in their environment.

  2. As was discussed upon in mtg with Guhon and team today, the repo is accessible only to MSFT only. So privilege is necessary for accessing https://github.com/Cisco-8000-sonic/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like its failing in which seems to be a breakage of azure/master branch. There is no code intersection. Is there a fix for this issue ?

File "/sonic/src/sonic-config-engine/tests/test_j2files.py", line 108, in test_zebra_quagga

Copy link
Collaborator

@xumia xumia Jun 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is another issue, build break on master(has fixed), we can re-run azp to fix it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which issue is this ?.

Copy link
Collaborator

@xumia xumia Jun 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR to fix master build issue: #7831

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All tests were successful. Can you please review & approve this PR

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@VenkatCisco , FYI, @liushilongbuaa is working on a feature to make git repo reproducible, when the feature enabled, a commit control file will be generated, we will only download specified commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xumia, Thanks for the update. How does that change impact this PR ?. If not can you please approve/merge it ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR is significantly updated based on the offline discussion cisco team had with the PR review team from MSFT. There are some more updates checked into the PR for review.

$(shell if [ -d $(CISCO_PLATFORM_SRC) ]; then cd $(CISCO_PLATFORM_SRC) && git checkout $(CISCO_8000_SHA1))
$(shell if [ -d $(CISCO_PLATFORM_SRC) ]; then $(CISCO_PLATFORM_SRC)/platform_setup.sh; fi)

include $(CISCO_PLATFORM_SRC)/rules.dep