Platform/cisco-8000 module for sonic-buildimage #8172

VenkatCisco · 2021-07-13T19:26:28Z

Why I did it

Update Makefile, so it does the following:
For a given platform, verify if platform/checkout/.ini exists and hence run the platform/checkout/template.j2. This allows platform code to be checked out during the 'make configure' stage.

How I did it

git clone git@github.com:Azure/sonic-buildimage.git
mkdir platform/cisco-8000

make init
make configure PLATFORM=cisco-8000
make all

How to verify it

Ensure, the platform/checkout/.ini file refers to the correct github page with the correct version tag that can be downloaded.

Which release branch to backport (provide reason below if selected)

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

…lude file Signed-off-by: Venkat Garigipati <venkatg@cisco.com>

xumia · 2021-07-14T06:36:27Z

@VenkatCisco , is the PR similar to #7821 ?

xumia · 2021-07-14T06:45:00Z

Makefile

+PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
+PLATFORM_CHECKOUT := platform/checkout
+PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
+PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)


To support azp, please allow the step can be skipped when the repo has already checked out.

To support azp, please allow the step can be skipped when the repo has already checked out.

@xumia would the change in platform/checkout/template.j2 be sufficient to support azp?

This step will automatically be skipped if the $(PLATFORM_PATH) directory already exists in the workspace

VenkatCisco · 2021-07-14T15:40:04Z

@VenkatCisco , is the PR similar to #7821 ?

Somehow given the forked branch is too old, updating #7821 resulted into #8172. So closed #7821. The platform changes are tracked via #8172

platform/checkout/template.j2

Makefile

huanlev

Request change to Makefile.

Makefile

xumia · 2021-07-16T09:02:31Z

@VenkatCisco , I created a pipeline for test only, please refer to the azp definition for the code checkout logic, thanks.
Commit on your change: xumia@ccdaf6e
Build result: https://dev.azure.com/mssonic/cisco/_build/results?buildId=24166&view=results
(The build failed with downloading package, maybe another issue, not sure cisco branch correct or not, could you please clarify it?)

The error is as below:

[ building ] [ target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb ] 
[ finished ] [ target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb ] 
[ FAIL LOG START ] [ target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb ]
cp: cannot stat 'platform/cisco-8000/artifactory/cisco-wb-bsp/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb': No such file or directory
[  FAIL LOG END  ] [ target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb ]
make: *** [slave.mk:308: target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb] Error 1

The PR looks good now, it may be only a submodule repo commit issue.

Signed-off-by: Venkat Garigipati <venkatg@cisco.com>

VenkatCisco · 2021-07-18T23:25:05Z

@xumia, the PR is updated based on the use case you mentioned. It also accommodates adjustments to the Makefile based on the new bullseye addition. Please review.

VenkatCisco · 2021-07-19T23:47:02Z

How to build 'sonic-cisco-8000.bin'

-make init
-make configure PLATFORM=cisco-8000
-make all

Ensure the platform/checkout/cisco-8000.ini has the right repo & tag versions that is been shared

judyjoseph · 2021-07-23T22:44:18Z

/azp run

azure-pipelines · 2021-07-23T22:44:35Z

Azure Pipelines successfully started running 1 pipeline(s).

judyjoseph · 2021-07-30T00:04:44Z

/azp run

azure-pipelines · 2021-07-30T00:05:01Z

Azure Pipelines successfully started running 1 pipeline(s).

liushilongbuaa · 2021-07-30T10:43:23Z

/azp run

azure-pipelines · 2021-07-30T10:43:40Z

Azure Pipelines successfully started running 1 pipeline(s).

xumia · 2021-07-31T00:28:01Z

@VenkatCisco , could you please run a test to build sonic-cisco-8000.bin? I tested in my local dev env, it was failed with the same result as I mentioned above.

[ FAIL LOG START ] [ target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb ]
cp: cannot stat 'platform/cisco-8000/artifactory/cisco-wb-bsp/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb': No such file or directory
[  FAIL LOG END  ] [ target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb ]
make: *** [slave.mk:308: target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb] Error 1

Looks like the PR missing a step to download artifactory-v0.1.tar.gz as: https://github.com/Cisco-8000-sonic/platform-cisco-8000/releases

huanlev · 2021-08-04T00:52:50Z

@VenkatCisco , could you please run a test to build sonic-cisco-8000.bin? I tested in my local dev env, it was failed with the same result as I mentioned above.
[ FAIL LOG START ] [ target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb ]
cp: cannot stat 'platform/cisco-8000/artifactory/cisco-wb-bsp/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb': No such file or directory
[  FAIL LOG END  ] [ target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb ]
make: *** [slave.mk:308: target/debs/buster/cisco-wb-acpi-8101-32h-o_0.1-0-ga5fd31d_amd64.deb] Error 1
Looks like the PR missing a step to download artifactory-v0.1.tar.gz as: https://github.com/Cisco-8000-sonic/platform-cisco-8000/releases

@xumia The build instruction is included in the private Cisco-8000-sonic github organization. It is not part of this PR (in which the intent is to integrate a private platform-specific repository into azure/sonic-buildimage during make configure PLATFORM=.....

Please review and merge if it is LGTM (and we also request a double-commit to 202012 branch). Thank you.

xumia · 2021-08-04T01:09:04Z

@huanlev , it works fine on master branch, but not good in 202012 branch, could you please take a look?
Master: https://dev.azure.com/mssonic/cisco/_build/results?buildId=26456&view=logs&j=62f941c1-829a-538b-5bf0-e540f1e71cee
202012 (Azure/sonic-buildimage): https://dev.azure.com/mssonic/cisco/_build/results?buildId=26561&view=logs&j=62f941c1-829a-538b-5bf0-e540f1e71cee&t=01718d7f-11bc-54b7-ded4-a9029f466c3a
202012 (Cisco-8000-sonic/sonic-buildimage): https://dev.azure.com/mssonic/cisco/_build/results?buildId=26561&view=logs&j=62f941c1-829a-538b-5bf0-e540f1e71cee&t=01718d7f-11bc-54b7-ded4-a9029f466c3a

xumia · 2021-08-04T01:12:12Z

@huanlev , for the release package, we need to add a step in azp to download it (see above links), is there any better solution, similar to download the other web packages during the build?

xumia · 2021-08-04T01:33:06Z

@qiluo-msft , could you please help review it?

huanlev · 2021-08-04T01:49:14Z

@huanlev , for the release package, we need to add a step in azp to download it (see above links), is there any better solution, similar to download the other web packages during the build?

@xumia we will collaborate more about this via email.

huanlev · 2021-08-04T01:51:03Z

@huanlev , it works fine on master branch, but not good in 202012 branch, could you please take a look?
Master: https://dev.azure.com/mssonic/cisco/_build/results?buildId=26456&view=logs&j=62f941c1-829a-538b-5bf0-e540f1e71cee
202012 (Azure/sonic-buildimage): https://dev.azure.com/mssonic/cisco/_build/results?buildId=26561&view=logs&j=62f941c1-829a-538b-5bf0-e540f1e71cee&t=01718d7f-11bc-54b7-ded4-a9029f466c3a
202012 (Cisco-8000-sonic/sonic-buildimage): https://dev.azure.com/mssonic/cisco/_build/results?buildId=26561&view=logs&j=62f941c1-829a-538b-5bf0-e540f1e71cee&t=01718d7f-11bc-54b7-ded4-a9029f466c3a

@xumia I don't have access to the 202012 (Cisco-8000-sonic) URL. Can you help giving me read permission?

huanlev · 2021-08-05T18:51:51Z

@xumia @qiluo-msft thanks for reviewing and approving the PR.
Can this PR be merged? or do we need to have another reviewer?

xumia · 2021-08-06T01:09:51Z

@xumia @qiluo-msft thanks for reviewing and approving the PR.
Can this PR be merged? or do we need to have another reviewer?

I think we can merge it, it should have no impact on the other platforms and the 202012 branch issue can be fixed later (not quite relative to this PR). For the azp to download the GitHub release artifacts, it is not very good, we need to do additional steps for cisco-8000, but it is acceptable.

Why I did it Update Makefile, so it does the following: For a given platform, verify if platform/checkout/.ini exists and hence run the platform/checkout/template.j2. This allows platform code to be checked out during the 'make configure' stage. How I did it git clone git@github.com:Azure/sonic-buildimage.git mkdir platform/cisco-8000 make init make configure PLATFORM=cisco-8000 make all

qiluo-msft · 2021-08-07T12:45:37Z

This PR could not be cleanly cherry-pick to 202012. Please submit another PR.

Why I did it Update Makefile, so it does the following: For a given platform, verify if platform/checkout/.ini exists and hence run the platform/checkout/template.j2. This allows platform code to be checked out during the 'make configure' stage. How I did it git clone git@github.com:Azure/sonic-buildimage.git mkdir platform/cisco-8000 make init make configure PLATFORM=cisco-8000 make all

huanlev · 2021-08-07T22:17:28Z

This PR could not be cleanly cherry-pick to 202012. Please submit another PR.

We will submit another PR for 202012. Thank you Qi!

anamehra · 2021-08-10T00:32:07Z

This PR could not be cleanly cherry-pick to 202012. Please submit another PR.

Hi Qi, submitted PR #8399

VenkatCisco added 5 commits June 8, 2021 10:23

Add platform cisco-8000 to platform path

27a2838

remove rules.mk.swp file

109cc7b

add ability to do check out a commit id

f7be554

update platform/cisco-8000/rules.mk to reflect the updated path & inc…

4e1059e

…lude file Signed-off-by: Venkat Garigipati <venkatg@cisco.com>

build cisco-8000 platform for sonic

0c55366

VenkatCisco marked this pull request as ready for review July 14, 2021 03:26

VenkatCisco requested review from lguohan, qiluo-msft and xumia as code owners July 14, 2021 03:26

xumia reviewed Jul 14, 2021

View reviewed changes

VenkatCisco mentioned this pull request Jul 14, 2021

Add platform cisco-8000 to platform path #7821

Closed

4 tasks

huanlev reviewed Jul 14, 2021

View reviewed changes

platform/checkout/template.j2 Show resolved Hide resolved

huanlev reviewed Jul 14, 2021

View reviewed changes

Makefile Outdated Show resolved Hide resolved

huanlev suggested changes Jul 14, 2021

View reviewed changes

xumia reviewed Jul 15, 2021

View reviewed changes

Makefile Show resolved Hide resolved

VenkatCisco changed the title ~~Venkat cisco/cisco 8000/pr~~ Platform/cisco-8000 module for sonic-buildimage Jul 16, 2021

VenkatCisco added 4 commits July 18, 2021 15:02

Merge branch 'master' into VenkatCisco/cisco-8000/PR

48401e7

update platform-cisco diffs with Makefile & template changes

aaf00a4

remove stale swp file reference

e4e7e5e

Remove stale reference to a patch file

a0ee24e

Signed-off-by: Venkat Garigipati <venkatg@cisco.com>

xumia approved these changes Aug 4, 2021

View reviewed changes

xumia added Request for 202012 Branch Request for 202106 Branch labels Aug 4, 2021

qiluo-msft approved these changes Aug 4, 2021

View reviewed changes

xumia merged commit 702e852 into sonic-net:master Aug 6, 2021

judyjoseph added the Included in 202106 Branch label Aug 7, 2021

qiluo-msft removed the Request for 202012 Branch label Aug 10, 2021

xumia mentioned this pull request Jan 24, 2022

[Build]: Fix buster slave not built during make configure issue #9838

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Platform/cisco-8000 module for sonic-buildimage #8172

Platform/cisco-8000 module for sonic-buildimage #8172

VenkatCisco commented Jul 13, 2021 •

edited

Loading

xumia commented Jul 14, 2021

xumia Jul 14, 2021

huanlev Jul 14, 2021

jusherma Jul 15, 2021

VenkatCisco commented Jul 14, 2021

huanlev left a comment

xumia commented Jul 16, 2021 •

edited

Loading

VenkatCisco commented Jul 18, 2021

VenkatCisco commented Jul 19, 2021

judyjoseph commented Jul 23, 2021

azure-pipelines bot commented Jul 23, 2021

judyjoseph commented Jul 30, 2021

azure-pipelines bot commented Jul 30, 2021

liushilongbuaa commented Jul 30, 2021

azure-pipelines bot commented Jul 30, 2021

xumia commented Jul 31, 2021 •

edited

Loading

huanlev commented Aug 4, 2021

xumia commented Aug 4, 2021

xumia commented Aug 4, 2021

xumia commented Aug 4, 2021

huanlev commented Aug 4, 2021

huanlev commented Aug 4, 2021

huanlev commented Aug 5, 2021

xumia commented Aug 6, 2021

qiluo-msft commented Aug 7, 2021

huanlev commented Aug 7, 2021

anamehra commented Aug 10, 2021

Platform/cisco-8000 module for sonic-buildimage #8172

Platform/cisco-8000 module for sonic-buildimage #8172

Conversation

VenkatCisco commented Jul 13, 2021 • edited Loading

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

xumia commented Jul 14, 2021

xumia Jul 14, 2021

Choose a reason for hiding this comment

huanlev Jul 14, 2021

Choose a reason for hiding this comment

jusherma Jul 15, 2021

Choose a reason for hiding this comment

VenkatCisco commented Jul 14, 2021

huanlev left a comment

Choose a reason for hiding this comment

xumia commented Jul 16, 2021 • edited Loading

VenkatCisco commented Jul 18, 2021

VenkatCisco commented Jul 19, 2021

judyjoseph commented Jul 23, 2021

azure-pipelines bot commented Jul 23, 2021

judyjoseph commented Jul 30, 2021

azure-pipelines bot commented Jul 30, 2021

liushilongbuaa commented Jul 30, 2021

azure-pipelines bot commented Jul 30, 2021

xumia commented Jul 31, 2021 • edited Loading

huanlev commented Aug 4, 2021

xumia commented Aug 4, 2021

xumia commented Aug 4, 2021

xumia commented Aug 4, 2021

huanlev commented Aug 4, 2021

huanlev commented Aug 4, 2021

huanlev commented Aug 5, 2021

xumia commented Aug 6, 2021

qiluo-msft commented Aug 7, 2021

huanlev commented Aug 7, 2021

anamehra commented Aug 10, 2021

VenkatCisco commented Jul 13, 2021 •

edited

Loading

xumia commented Jul 16, 2021 •

edited

Loading

xumia commented Jul 31, 2021 •

edited

Loading