Skip to content

Support pulling sonic-slave-docker image from path at REGISTRY_SERVER#20

Closed
dprital wants to merge 3 commits intomasterfrom
master-add-folder-option-to-reisgtry-server
Closed

Support pulling sonic-slave-docker image from path at REGISTRY_SERVER#20
dprital wants to merge 3 commits intomasterfrom
master-add-folder-option-to-reisgtry-server

Conversation

@dprital
Copy link
Owner

@dprital dprital commented Apr 27, 2023

Why I did it

In order to reduce sonic build time, there is an option to acquire sonic slave docker(s) from artifact server (reduce sonic make configure time).
Current implementation supports only convention of:

<REGISTRY_SERVER>:<REGISTRY_PORT>/<SLAVE_BASE_IMAGE>:<SLAVE_BASE_TAG>

In case the SLAVE_BASE_IMAGE appear in internal path inside the server, the convention should be like that:

<REGISTRY_SERVER>:<REGISTRY_PORT><REGISTRY_SERVER_PATH>/<SLAVE_BASE_IMAGE>:<SLAVE_BASE_TAG>

When REGISTRY_SERVER_PATH (that is set on rules/config) will have to start with "/".

If REGISTRY_SERVER_PATH will not be set, the behavior will remain the same it works today.

Work item tracking
  • Microsoft ADO (number only):

How I did it

Add ability to set REGISTRY_SERVER_PATH and update the code for docker image tag and docker image pull accordingly

How to verify it

Use sonic slave docker image from artifact server in which the image is kept in internal folder and make sure it consume it.

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

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

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

@dprital dprital changed the title Add ability to navigate to specific folder inside registry server whe… Support pulling sonic-slave-docker image from internal folder at REGISTRY_SERVER Apr 27, 2023
rules/config Outdated
# Set the env variable ENABLE_DOCKER_BASE_PULL = y to enable pulling sonic-slave docker from registry
REGISTRY_PORT ?= 443
REGISTRY_SERVER ?= sonicdev-microsoft.azurecr.io
REGISTRY_SERVER_FOLDER ?=

Choose a reason for hiding this comment

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

Suggested change
REGISTRY_SERVER_FOLDER ?=
REGISTRY_SERVER_PATH ?=

Copy link
Owner Author

@dprital dprital Apr 27, 2023

Choose a reason for hiding this comment

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

Fixed. Thanks.

@dprital dprital changed the title Support pulling sonic-slave-docker image from internal folder at REGISTRY_SERVER Support pulling sonic-slave-docker image from path at REGISTRY_SERVER Apr 27, 2023
@dprital dprital requested a review from nazariig April 27, 2023 13:32
@dprital dprital closed this May 1, 2023
@dprital dprital deleted the master-add-folder-option-to-reisgtry-server branch June 8, 2023 08:12
dprital pushed a commit that referenced this pull request Mar 11, 2024
…sonic-net#18273)

#### Why I did it
src/dhcpmon
```
* 22a7467 - (HEAD -> master, origin/master, origin/HEAD) Fix revert (#21) (9 hours ago) [kellyyeh]
* b1d890a - Revert DHCP Counter (#20) (24 hours ago) [kellyyeh]
```
#### How I did it
#### How to verify it
#### Description for the changelog
dprital pushed a commit that referenced this pull request Jul 3, 2024
…sonic-net#19155)

#### Why I did it
src/dhcpmon
```
* 099e148 - (HEAD -> 202311, origin/202311) Merge pull request #22 from yaqiangz/202311_cherry_pick (2 hours ago) [Ying Xie]
* efff8a9 - Fix revert (#21) (2 hours ago) [kellyyeh]
* 617066f - Revert DHCP Counter (#20) (2 hours ago) [kellyyeh]
```
#### How I did it
#### How to verify it
#### Description for the changelog
dprital pushed a commit that referenced this pull request Sep 29, 2024
* Update to Linux 6.1.94

Signed-off-by: Saikrishna Arcot <[email protected]>

* Integrate HW-MGMT 7.0040.1008 Changes (#18)

* Integrate HW-MGMT 7.0040.1011 Changes (#19)

* Update sonic-linux-kernel submodule (#20)

Signed-off-by: Vivek Reddy <[email protected]>

---------

Signed-off-by: Saikrishna Arcot <[email protected]>
Signed-off-by: Vivek Reddy <[email protected]>
Co-authored-by: Vivek <[email protected]>
dprital pushed a commit that referenced this pull request Oct 12, 2025
…t back to back Paladin ports up with Arista-7060X6-16PE-384C-O128S2 (sonic-net#22719)

<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

 failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **

 If this is a bug fix, make sure your description includes "fixes #xxxx", or
 "closes #xxxx" or "resolves #xxxx"

 Please provide the following information:
-->

#### Why I did it

Currently when we loaded HWSKU `Arista-7060X6-16PE-384C-O128S2` on two moby devices and connect their Paladin ports back to back, we can't get link up. It may help if we can get these links up and run the tests.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

Created a new `FANOUT` HWSKU containing special lanemap and polarity configs so that we can load `Arista-7060X6-16PE-384C-O128S2` on one Moby and `Arista-7060X6-16PE-384C-O128S2-FANOUT` and get Paladin ports up when connecting them back to back with the following setup:
```
Moby1 Moby2
HWSKU: Arista-7060X6-16PE-384C-O128S2 HWSKU: Arista-7060X6-16PE-384C-O128S2-FANOUT
#17 <-> #18
#19 <-> #20
#21 <-> #22
#23 <-> #24

#18 <-> #17
#20 <-> #19
#22 <-> #21
#24 <-> #23
```

#### How to verify it
Verified that all the Paladin ports can link up with the above setup.

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
- [x] msft-202412

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
Created `Arista-7060X6-16PE-384C-O128S2-FANOUT` based on `Arista-7060X6-16PE-384C-O128S2` and only update lanemap and polarity settings in bcm config.

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
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.

2 participants