Skip to content

Change PTF docker image to use GNXI from google repo #22062

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.

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

Merged

Conversation

liuh-80
Copy link
Contributor

@liuh-80 liuh-80 commented Mar 18, 2025

Change PTF docker image to use GNXI from google repo

Why I did it

Currently PTF docker using GNXI from a private repo

Work item tracking
  • Microsoft ADO (number only):

How I did it

Change PTF docker image to use GNXI from google repo
Generate patch file from private repo and apply to google repo.

How to verify it

Pass all test case.
Download ptf docker image and verified the patched GNXI is same with private repo.

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Change PTF docker image to use GNXI from google repo

Link to config_db schema for YANG module changes

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

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@liuh-80 liuh-80 marked this pull request as ready for review March 19, 2025 05:44
@liuh-80 liuh-80 requested a review from lguohan as a code owner March 19, 2025 05:44
@liuh-80 liuh-80 requested a review from qiluo-msft March 19, 2025 05:44
Copy link
Contributor

@hdwhdw hdwhdw left a comment

Choose a reason for hiding this comment

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

LGTM but just curious, how do you get these patches, can we have some metadata here like:

# Metadata
# Source: https://github.com/lguohan/gnxi
# Commit: <commit-sha>
# Author: Author Name <[email protected]>
# Date: YYYY-MM-DD
# Description: Add xpath_target option

at the top of these .patch file?

@zbud-msft
Copy link
Contributor

LGTM but just curious, how do you get these patches, can we have some metadata here like:

# Metadata
# Source: https://github.com/lguohan/gnxi
# Commit: <commit-sha>
# Author: Author Name <[email protected]>
# Date: YYYY-MM-DD
# Description: Add xpath_target option

at the top of these .patch file?

These patches were commits made to previous forked repo.

@liuh-80
Copy link
Contributor Author

liuh-80 commented Mar 21, 2025

Verified again, the patched files are exactly same:

  1. Download ptf docker image and create a docker
  2. Copy /root/gnix from ptf docker
  3. Remove .git .pc patches folder, because these files not part of code
  4. Clone https://github.com/lguohan/gnxi.git and checkout 3adf8b9 commit, also delete .git folder
  5. Compare 2 folder, files are exactly same:

liuh@liuh-vm0:/sonic/gnxi$ git diff ./gnxi ./gnxi_docker
liuh@liuh-vm0:
/sonic/gnxi$

@hdwhdw hdwhdw self-requested a review March 21, 2025 02:21
Copy link
Contributor

@hdwhdw hdwhdw left a comment

Choose a reason for hiding this comment

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

LGTM

@qiluo-msft qiluo-msft merged commit dfb17e2 into sonic-net:master Mar 21, 2025
21 checks passed
yanjundeng pushed a commit to yanjundeng/sonic-buildimage that referenced this pull request Apr 23, 2025
Change PTF docker image to use GNXI from google repo

#### Why I did it
Currently PTF docker using GNXI from a private repo

#### How I did it
Change PTF docker image to use GNXI from google repo
Generate patch file from private repo and apply to google repo.

#### How to verify it
Pass all test case.
Download ptf docker image and verified the patched GNXI is same with private repo.

#### Description for the changelog
Change PTF docker image to use GNXI from google repo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants