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.

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

[build]: support specifying builder mount point and workdir #2214

Merged
merged 1 commit into from
Nov 5, 2018

Conversation

ishidawataru
Copy link
Collaborator

- What I did

support buildimage repo to be a git submodule

- How I did it

If we put this repo as a git submodule of other git repo, make all fails because sonic_get_version() doesn't work inside a build container.

Inside sonic_get_version(), git describe commands are executed. To make these command work, git command need to access the .git directory which is not mounted in a build container.

This commit makes a build container mount a parent git directory to give access to the .git directory if this repo is a git submodule.

- How to verify it

make this repo git submodule and run make all

- Description for the changelog

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

@lguohan
Copy link
Collaborator

lguohan commented Oct 31, 2018

the solution is a little bit complicated, why not expose the option to allow user to mount any place into the docker?

@ishidawataru
Copy link
Collaborator Author

The directory we need to mount and the working directory is different in git submodule case.

For example, if sonic-buildimage is a git submodule of parent_repo, we need to mount parent_repo and set parent_repo/sonic-buildimage as the working directory.

With your suggestion, should I add two options, one for the directory to mount and the other for the working directory?

@lguohan
Copy link
Collaborator

lguohan commented Nov 2, 2018

yes, that will do.

This can be used when sonic-buildimage repo is a git submodule of other
repo.

e.g) if sonic-buildimage is a git submodule of "parent" repo and
sonic-buildimage is just under the top directory of "parent" repo, we
can build sonic-buildimage like below

$ cd parent/sonic-buildimage
$ DOCKER_BUILDER_MOUNT=`realpath ../`:`realpath ../` \
  DOCKER_BUILDER_WORKDIR=`pwd` make all

Signed-off-by: Wataru Ishida <ishida@nel-america.com>
@ishidawataru
Copy link
Collaborator Author

@lguohan followed your suggestion. PTAL.

@lguohan
Copy link
Collaborator

lguohan commented Nov 4, 2018

can you change the title and commit message?

@ishidawataru ishidawataru changed the title make: support buildimage repo to be git submodule [build]: support specifying builder mount point and workdir Nov 5, 2018
@ishidawataru
Copy link
Collaborator Author

@lguohan How should I change them?

@stcheng
Copy link
Contributor

stcheng commented Nov 5, 2018

@ishidawataru you could force push to update the commit message

@ishidawataru
Copy link
Collaborator Author

ishidawataru commented Nov 5, 2018

@stcheng I meant the sentence of the title and the commit message.

Current commit message is the below.

[build]: support specifying builder mount point and workdir

This can be used when sonic-buildimage repo is a git submodule of other
repo.

e.g) if sonic-buildimage is a git submodule of "parent" repo and
sonic-buildimage is just under the top directory of "parent" repo, we
can build sonic-buildimage like below

$ cd parent/sonic-buildimage
$ DOCKER_BUILDER_MOUNT=`realpath ../`:`realpath ../` \
  DOCKER_BUILDER_WORKDIR=`pwd` make all

Signed-off-by: Wataru Ishida <ishida@nel-america.com>

I'm not sure how the title/message should be for this commit.

I know about force push, thanks :)

@lguohan lguohan merged commit 4b21ff1 into sonic-net:master Nov 5, 2018
@ishidawataru ishidawataru deleted the make branch November 5, 2018 18:44
wen587 pushed a commit that referenced this pull request Jun 22, 2022
05c79ef Fix header for the output table following 'show ipv6 interface' command (#2219)
fc5633f increase coverage to 80% (#2214)
c0dffba [config][muxcable] fix minor config DB logic issue (#2210)
a50eca0 [generic-config-updater] Add NTP validator  (#2212)
a3d1345 [gendump] Add Support to dump BCM-DNX commands (#1813)
bb185d5 [yang] remove mistakenly added parameter for 'get_module_name' (#2193)
2cccf26 [counters] skip showing counters that are not enabled (#2199)
ff05bc8 [config][muxcable] Add support for displaying soc_ipv4 and cable_type in config/show muxcable commands (#2189)
3197f39 Add check to not allow deleting PO if its member of vlan. (#2141)
2513da1 [dump] Optimized dump state cli and modified tests to not use common data  (#2175)
9e310e5 Fix sonic-installer and 'show version' command crash when database docker not running issue. (#2183)
4ad70b9 [sonic-installer] use host docker startup arguments when running dockerd in chroot  (#2179)
3d3c89b fix for non-coherent cmis modules (#2163)
2054680 [subinterface] Fix route add command to accept subinterface as dev (#2180)
5383e92 [subinterface]Avoid removing the subinterface when last configured ip is removed (#2181)
f5af780 [GCU] Handling type1 lists (#2171)
4516179 [yang] extend ConfigMgmt constructor to pass YANG options (#2118)
2f53bd4 [dump] implement ACL modules (#2153)
494dd62 show commands for SYSTEM READY (#1851)
4fc09b1 [GCU] Handling non-compliant leaf-list with string values (#2174)
675c7b6 Add sonic-delayed.target to Application Extension .timer file generator (#2176)
c587933 [portconfig] Allow to configure interface mtu for physical ports only
9881f3e Broadcast Unknown-multicast and Unknown-unicast Storm-control  (#928)
88286cb sonic-utils: initial support for link-training (#2071)
vivekrnv added a commit to vivekrnv/sonic-buildimage that referenced this pull request Dec 17, 2022
6185324 dereg acl-rule counters during acl-table del (sonic-net#2574)
b865352 Align watermark flow with port configuration (sonic-net#2525)
f2d2fb3 L3 / L3 V6  Egress ACL table creation failure (sonic-net#2561)
577f696 [muxorch] Skip programming ACL for standby `active-active` ports (sonic-net#2569)
242ee11 [muxorch] Skip programming SoC IP kernel tunnel route (sonic-net#2557)
6695113 [gearbox] Support setting tx taps on gearbox ports (sonic-net#2158)
872f7bf [portinit] Do not call GET on SAI_PORT_ATTR_SPEED when AUTONEG is enabled (sonic-net#2484)
6afefe1 [vstest][virtual chassis] Removed dvs.runcmd using click commands (sonic-net#2214)
b8521cc [p4orch]: PINS Extension tables support (sonic-net#2506)
d0419dc sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552)
bd652a0 [muxorch] Adding case for maintaining current state (sonic-net#2280)
6b6dda6 [Centec]for support mclag of centec to configure port isolate-group sonic-net#2529
ec507a4 [ACL] Support ACTION_COUNTER action in custom ACL table type (sonic-net#2550)
1a74604 Use github code scanning instead of LGTM (sonic-net#2546)
bc3c894 [dual-tor] add missing SAI attribte in order to create IPNIP tunnel (sonic-net#2503)
dca78d8 (origin/202211) [Fdbsyncd] Bug Fix for remote MAC move to local MAC and Fix for Static MAC advertisement in EVPN. (sonic-net#2521)

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
liat-grozovik pushed a commit that referenced this pull request Dec 20, 2022
6185324 dereg acl-rule counters during acl-table del (#2574)
b865352 Align watermark flow with port configuration (#2525)
f2d2fb3 L3 / L3 V6  Egress ACL table creation failure (#2561)
577f696 [muxorch] Skip programming ACL for standby `active-active` ports (#2569)
242ee11 [muxorch] Skip programming SoC IP kernel tunnel route (#2557)
6695113 [gearbox] Support setting tx taps on gearbox ports (#2158)
872f7bf [portinit] Do not call GET on SAI_PORT_ATTR_SPEED when AUTONEG is enabled (#2484)
6afefe1 [vstest][virtual chassis] Removed dvs.runcmd using click commands (#2214)
b8521cc [p4orch]: PINS Extension tables support (#2506)
d0419dc sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (#2552)
bd652a0 [muxorch] Adding case for maintaining current state (#2280)
6b6dda6 [Centec]for support mclag of centec to configure port isolate-group #2529
ec507a4 [ACL] Support ACTION_COUNTER action in custom ACL table type (#2550)
1a74604 Use github code scanning instead of LGTM (#2546)
bc3c894 [dual-tor] add missing SAI attribte in order to create IPNIP tunnel (#2503)
dca78d8 (origin/202211) [Fdbsyncd] Bug Fix for remote MAC move to local MAC and Fix for Static MAC advertisement in EVPN. (#2521)
mihirpat1 pushed a commit to mihirpat1/sonic-buildimage that referenced this pull request Jun 14, 2023
…nic-net#2214)

[VS] click commands usage is avoided in test_virtual_chassis.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants