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

[docker-base]: Build supervisor package from source in order to update to v3.3.2 #777

Merged
merged 2 commits into from
Jul 6, 2017
Merged

[docker-base]: Build supervisor package from source in order to update to v3.3.2 #777

merged 2 commits into from
Jul 6, 2017

Conversation

jleveque
Copy link
Contributor

Resolves #762.

@qiluo-msft
Copy link
Collaborator

qiluo-msft commented Jul 1, 2017

Suggest move changes on sonic-slave into individual PR, so the slave docker on the Jenkins will updated before used to check other PR. #Closed


Refers to: sonic-slave/Dockerfile:2 in 7be9656. [](commit_id = 7be9656, deletion_comment = False)

@@ -34,25 +34,45 @@ COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"]
COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"]
COPY ["root/.vimrc", "/root/.vimrc"]

# Install dependencies of supervisor
Copy link
Collaborator

@qiluo-msft qiluo-msft Jul 1, 2017

Choose a reason for hiding this comment

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

Install dependencies of supervisor [](start = 2, length = 34)

These packages should be defined as supervisor's runtime dependencies, following other sonic component Makefile. #Closed

Copy link
Collaborator

Choose a reason for hiding this comment

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

use _RDEPENDS

Copy link
Contributor Author

Choose a reason for hiding this comment

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

"_RDEPENDS" is only used for installing runtime dependencies that we build, correct? The packages I am installing here are standard packages in the Debian repo.

Copy link
Collaborator

Choose a reason for hiding this comment

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

in line 58, you have apt-get -y install -f that help to fix the dependency, so you probably do notneed line 38.


In reply to: 125733195 [](ancestors = 125733195)

@@ -2,6 +2,7 @@

DOCKER_BASE = docker-base.gz
$(DOCKER_BASE)_PATH = $(DOCKERS_PATH)/docker-base
$(DOCKER_BASE)_DEPENDS += $(SUPERVISOR)
Copy link
Collaborator

Choose a reason for hiding this comment

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

SUPERVISOR [](start = 28, length = 10)

Suggest not include built packages into docker-base.
All component here are directly downloaded from debian sources server, and main updated for security update.
supervisor is likely to update more often than them, like a development package.

Copy link
Collaborator

Choose a reason for hiding this comment

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

it is used by every docker so I think it makes sense to be included in the docker-base.

@jleveque
Copy link
Contributor Author

jleveque commented Jul 5, 2017

Regarding "Suggest move changes on sonic-slave into individual PR, so the slave docker on the Jenkins will updated before used to check other PR.":

The sonic-slave docker is now rebuilt with every PR, hence why this PR passed all 4 checks.

@lguohan
Copy link
Collaborator

lguohan commented Jul 6, 2017

:shipit:

@jleveque jleveque merged commit a697e8e into sonic-net:master Jul 6, 2017
@jleveque jleveque deleted the build_supervisor branch July 6, 2017 17:32
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Feb 5, 2019
Submodule src/sonic-sairedis 60f97c3..bdb0074:
  > Add more information on failed map sizes (sonic-net#416)
  > Add WRED specific comparison logic (sonic-net#413)
  > Initialize notification queue pointer before switch create (sonic-net#411)
  > Add log info for not matching SG/IPG/QUEUES (sonic-net#409)
  > Add support for any number of ports in virtual switch using lane map (sonic-net#407)

Submodule src/sonic-swss 85f6322..65a0256:
  > Increase the watermark polling interval to 10s (sonic-net#777)
  > [vstest]: fix test_port_an_warm.py test (sonic-net#779)
  > [wartermarkorch] Fix repeated m_pg_ids and m_unicast_queue_ids add up issue (sonic-net#752)
  > [teammgrd] Fix inconsistent port admin status (sonic-net#755)
  > Remove AclTableGroup upon removal of port/lag/vlan (sonic-net#751)


Signed-off-by: Ying Xie <[email protected]>
yxieca added a commit that referenced this pull request Feb 6, 2019
…nch (#2526)

* [submodule 201811] advance sairedis and swss submodule for 201811 branch

Submodule src/sonic-sairedis 60f97c3..bdb0074:
  > Add more information on failed map sizes (#416)
  > Add WRED specific comparison logic (#413)
  > Initialize notification queue pointer before switch create (#411)
  > Add log info for not matching SG/IPG/QUEUES (#409)
  > Add support for any number of ports in virtual switch using lane map (#407)

Submodule src/sonic-swss 85f6322..65a0256:
  > Increase the watermark polling interval to 10s (#777)
  > [vstest]: fix test_port_an_warm.py test (#779)
  > [wartermarkorch] Fix repeated m_pg_ids and m_unicast_queue_ids add up issue (#752)
  > [teammgrd] Fix inconsistent port admin status (#755)
  > Remove AclTableGroup upon removal of port/lag/vlan (#751)


Signed-off-by: Ying Xie <[email protected]>

* [submodule] advance sonic-swss submodule

Submodule src/sonic-swss 65a0256..bf21ee3:
  > On a routing vlan, the neighbor entry in the /31 subnet is not added … (#784)
  > portsorch ports init done flag should means buffer, autoneg, speed, m… (#747) (#783)

Signed-off-by: Ying Xie <[email protected]>
lguohan added a commit to yxieca/sonic-buildimage that referenced this pull request Feb 16, 2019
swss

* a6d60f2 2019-02-15 | Create egress ACL table group during the PFCWD stats list installment (sonic-net#787) (HEAD, origin/master, origin/HEAD) [Wenda Ni]
* 52de963 2019-02-15 | [fpmsyncd] Add VNET routes support (sonic-net#772) [Wei Bai]
* d27f49e 2019-02-13 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#786) [Jipan Yang]
* 6363985 2019-02-08 | [vstest]: Potential fix for timing issue in warm_reboot's routing UT (sonic-net#788) [Rodny Molina]
* 6d5424d 2019-02-07 | VNet/Vxlan delete handling (sonic-net#766) [Prince Sunny]
* d680ce2 2019-02-07 | [neighsyncd] increase neighbor syncd restore timeout to 110 seconds (sonic-net#745) [Ying Xie]
* b78cc8d 2019-02-01 | support 8 lanes for a physical port (sonic-net#778) [lguohan]
* 73b620c 2019-02-01 | Increase the watermark polling interval to 10s (sonic-net#777) [Wenda Ni]
* a2b987b 2019-02-01 | [vstest]: fix test_speed.py (sonic-net#780) [lguohan]
* cef4bd0 2019-02-01 | [vstest]: fix test_port_an_warm.py test (sonic-net#779) [lguohan]
* 9f20eda 2019-02-01 | fix a unstable swss egress acl test (sonic-net#776) [Kebo Liu]
* 316ae6c 2019-01-30 | portsorch ports init done flag should means buffer, autoneg, speed, m… (sonic-net#747) [Jipan Yang]
* 4280036 2019-01-30 | [teammgrd] Fix inconsistent port admin status (sonic-net#755) [Jipan Yang]
* cf12bdf 2019-01-30 | Remove AclTableGroup upon removal of port/lag/vlan (sonic-net#751) [Jipan Yang]
* 5779c1a 2019-01-29 | [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741) [Kebo Liu]
* 36e85eb 2019-01-29 | On a routing vlan, the neighbor entry in the /31 subnet is not added to hardware (sonic-net#771) [Kiran Kumar Kella]
* 882ccc6 2019-01-24 | [vnetorch] Change logic for adding VNet interface (sonic-net#761) [Marian Pritsak]
* f637557 2019-01-25 | [vrfmgrd] Fix VRF is not set to VRF_TABLE in APP_DB correctly (sonic-net#768) [yorke]
* e84a6ab 2019-01-24 | use sai_stat_id_t for new SAI header file (sonic-net#769) [lguohan]

sairedis

* d685e35 2019-02-15 | Add support for fdb_event MOVE and check fdb event oids (sonic-net#420) (HEAD, origin/master, origin/HEAD) [Kamil Cudnik]
* 2b91013 2019-02-15 | [vslib] add missing port attributes for virtual switch (sonic-net#419) [Stepan Blyshchak]
* dcc8688 2019-02-14 | Add more specific logic for ingress ACL and buffer profile (sonic-net#421) [Kamil Cudnik]
* c0b39ea 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#418) [Jipan Yang]
* ab35dfa 2019-02-11 | Add support for vlan tagged frames in virtual switch (sonic-net#417) [Kamil Cudnik]
* 145ea44 2019-02-02 | [flex counter] handle router interface stats (sonic-net#410) [Mykola F]
* c03d639 2019-02-02 | Add more information on failed map sizes (sonic-net#416) [Kamil Cudnik]
* 29f1e3c 2019-01-31 | Update SAI pointer (sonic-net#414) [Marian Pritsak]
* c0a948d 2019-01-30 | Add WRED specific comparison logic (sonic-net#413) [Kamil Cudnik]
* 1b6a661 2019-01-24 | install SAI extension header files into /usr/include/sai (sonic-net#412) [lguohan]
* 849525a 2019-01-24 | Initialize notification queue pointer before switch create (sonic-net#411) [Kamil Cudnik]
* 02d92f1 2019-01-23 | Add log info for not matching SG/IPG/QUEUES (sonic-net#409) [Kamil Cudnik]
* 8793562 2019-01-18 | Update SAI pointer to latest master (sonic-net#408) [Marian Pritsak]

swss-common

* ec04a5a 2019-02-14 | Add support for WarmStart::setDataCheckState() (sonic-net#242) [Jipan Yang]
* 56bd73f 2019-02-13 | Force only supported commands on consumer table (sonic-net#261) [Kamil Cudnik]
* 414de0f 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#260) [Jipan Yang]
* 88de725 2019-02-05 | [pyext] enable types in stdint.h (sonic-net#259) [Ying Xie]
* f457ae8 2019-02-05 | Optimized ProducerStateTable set/del notification processing to avoid… (sonic-net#257) [Jipan Yang]
* e5286fd 2019-01-30 | [rif counters] Rif counter schema update (sonic-net#256) [Mykola F]

sonic-utilities

* b44b462 2019-02-14 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… (sonic-net#458) (HEAD, origin/master, origin/HEAD) [Jipan Yang]
* e856b8b 2019-02-11 | [aclshow] output only counters per table/rule (sonic-net#442) [Roman Kachur]

Signed-off-by: Guohan Lu <[email protected]>
lguohan pushed a commit that referenced this pull request Feb 16, 2019
…g Broadcom SAI build (#2488)

* [Broadcom SAI] upgrade Broadcom SAI to 3.3.4.3m-3

This is SAI 3.3.4.3m-3 compiled with SAI header file at commit ID
6ad3382217ec22f64cd268faefcbc2ff7caba4fd of SAI repo.

Signed-off-by: Ying Xie <[email protected]>

* change libsaithrift version to 0.9.4

Signed-off-by: Guohan Lu <[email protected]>

* [submodule]: update swss, sairedis, swss-common, sonic-utilities

swss

* a6d60f2 2019-02-15 | Create egress ACL table group during the PFCWD stats list installment (#787) (HEAD, origin/master, origin/HEAD) [Wenda Ni]
* 52de963 2019-02-15 | [fpmsyncd] Add VNET routes support (#772) [Wei Bai]
* d27f49e 2019-02-13 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#786) [Jipan Yang]
* 6363985 2019-02-08 | [vstest]: Potential fix for timing issue in warm_reboot's routing UT (#788) [Rodny Molina]
* 6d5424d 2019-02-07 | VNet/Vxlan delete handling (#766) [Prince Sunny]
* d680ce2 2019-02-07 | [neighsyncd] increase neighbor syncd restore timeout to 110 seconds (#745) [Ying Xie]
* b78cc8d 2019-02-01 | support 8 lanes for a physical port (#778) [lguohan]
* 73b620c 2019-02-01 | Increase the watermark polling interval to 10s (#777) [Wenda Ni]
* a2b987b 2019-02-01 | [vstest]: fix test_speed.py (#780) [lguohan]
* cef4bd0 2019-02-01 | [vstest]: fix test_port_an_warm.py test (#779) [lguohan]
* 9f20eda 2019-02-01 | fix a unstable swss egress acl test (#776) [Kebo Liu]
* 316ae6c 2019-01-30 | portsorch ports init done flag should means buffer, autoneg, speed, m… (#747) [Jipan Yang]
* 4280036 2019-01-30 | [teammgrd] Fix inconsistent port admin status (#755) [Jipan Yang]
* cf12bdf 2019-01-30 | Remove AclTableGroup upon removal of port/lag/vlan (#751) [Jipan Yang]
* 5779c1a 2019-01-29 | [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (#741) [Kebo Liu]
* 36e85eb 2019-01-29 | On a routing vlan, the neighbor entry in the /31 subnet is not added to hardware (#771) [Kiran Kumar Kella]
* 882ccc6 2019-01-24 | [vnetorch] Change logic for adding VNet interface (#761) [Marian Pritsak]
* f637557 2019-01-25 | [vrfmgrd] Fix VRF is not set to VRF_TABLE in APP_DB correctly (#768) [yorke]
* e84a6ab 2019-01-24 | use sai_stat_id_t for new SAI header file (#769) [lguohan]

sairedis

* d685e35 2019-02-15 | Add support for fdb_event MOVE and check fdb event oids (#420) (HEAD, origin/master, origin/HEAD) [Kamil Cudnik]
* 2b91013 2019-02-15 | [vslib] add missing port attributes for virtual switch (#419) [Stepan Blyshchak]
* dcc8688 2019-02-14 | Add more specific logic for ingress ACL and buffer profile (#421) [Kamil Cudnik]
* c0b39ea 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#418) [Jipan Yang]
* ab35dfa 2019-02-11 | Add support for vlan tagged frames in virtual switch (#417) [Kamil Cudnik]
* 145ea44 2019-02-02 | [flex counter] handle router interface stats (#410) [Mykola F]
* c03d639 2019-02-02 | Add more information on failed map sizes (#416) [Kamil Cudnik]
* 29f1e3c 2019-01-31 | Update SAI pointer (#414) [Marian Pritsak]
* c0a948d 2019-01-30 | Add WRED specific comparison logic (#413) [Kamil Cudnik]
* 1b6a661 2019-01-24 | install SAI extension header files into /usr/include/sai (#412) [lguohan]
* 849525a 2019-01-24 | Initialize notification queue pointer before switch create (#411) [Kamil Cudnik]
* 02d92f1 2019-01-23 | Add log info for not matching SG/IPG/QUEUES (#409) [Kamil Cudnik]
* 8793562 2019-01-18 | Update SAI pointer to latest master (#408) [Marian Pritsak]

swss-common

* ec04a5a 2019-02-14 | Add support for WarmStart::setDataCheckState() (#242) [Jipan Yang]
* 56bd73f 2019-02-13 | Force only supported commands on consumer table (#261) [Kamil Cudnik]
* 414de0f 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#260) [Jipan Yang]
* 88de725 2019-02-05 | [pyext] enable types in stdint.h (#259) [Ying Xie]
* f457ae8 2019-02-05 | Optimized ProducerStateTable set/del notification processing to avoid… (#257) [Jipan Yang]
* e5286fd 2019-01-30 | [rif counters] Rif counter schema update (#256) [Mykola F]

sonic-utilities

* b44b462 2019-02-14 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… (#458) (HEAD, origin/master, origin/HEAD) [Jipan Yang]
* e856b8b 2019-02-11 | [aclshow] output only counters per table/rule (#442) [Roman Kachur]

Signed-off-by: Guohan Lu <[email protected]>

* [mlnx] update mellanox sai

Signed-off-by: Stepan Blyschak <[email protected]>
daall added a commit to daall/sonic-buildimage that referenced this pull request Jan 28, 2020
- [neighbor advertiser] remove http endpoint access (sonic-net#792)
- [dropconfig] Move prefix-handling from CLI to orchagent (sonic-net#785)
- [acl-loader] Use V6 ethertype for IPv6 ACL rule (sonic-net#788)
- kdump support (sonic-net#729)
- Add command line support for thermal control (sonic-net#777)
- [fdbshow][nbrshow] Print interface OID in lieu of name if there is no OID->interface name mapping (sonic-net#789)
- ipaddr module to ipaddress for show command (sonic-net#786)
- [sonic_installer] Adding support for ARM Uboot firmware (sonic-net#769)
- [config] Merge duplicate vrf configuration (sonic-net#759)
- [dropconfig] Clean-up error output for devices that do not support drop counters (sonic-net#784)
- [show] enhance 'show ip[v6] bgp summary' command (sonic-net#754)
- On sflow enable, start the docker since it is disabled by default (sonic-net#773)
- [portstat] fix header used (sonic-net#743)
- Add VRF-related commands to Command Reference Document (sonic-net#778)
- [intfstat] fix --delete fail when counters dump does not exist (sonic-net#752)
- [scripts] Adds support for management (1.0) commands (sonic-net#745)
- A generic JSON file updater, which can add/update-existing attributes. (sonic-net#770)
- [command reference] Update show int counters info with l3 RIF (sonic-net#725)
- [fast/warm reboot] ignore errors after shutting down critical service(s) (sonic-net#761)
- Platform Driver Development Framework (PDDF): Adding PDDF CLI utils (sonic-net#624)
- Platform plugin for Fast-reboot/warm-reboot (sonic-net#740)

Signed-off-by: Danny Allen <[email protected]>
lguohan pushed a commit that referenced this pull request Jan 28, 2020
- [neighbor advertiser] remove http endpoint access (#792)
- [dropconfig] Move prefix-handling from CLI to orchagent (#785)
- [acl-loader] Use V6 ethertype for IPv6 ACL rule (#788)
- kdump support (#729)
- Add command line support for thermal control (#777)
- [fdbshow][nbrshow] Print interface OID in lieu of name if there is no OID->interface name mapping (#789)
- ipaddr module to ipaddress for show command (#786)
- [sonic_installer] Adding support for ARM Uboot firmware (#769)
- [config] Merge duplicate vrf configuration (#759)
- [dropconfig] Clean-up error output for devices that do not support drop counters (#784)
- [show] enhance 'show ip[v6] bgp summary' command (#754)
- On sflow enable, start the docker since it is disabled by default (#773)
- [portstat] fix header used (#743)
- Add VRF-related commands to Command Reference Document (#778)
- [intfstat] fix --delete fail when counters dump does not exist (#752)
- [scripts] Adds support for management (1.0) commands (#745)
- A generic JSON file updater, which can add/update-existing attributes. (#770)
- [command reference] Update show int counters info with l3 RIF (#725)
- [fast/warm reboot] ignore errors after shutting down critical service(s) (#761)
- Platform Driver Development Framework (PDDF): Adding PDDF CLI utils (#624)
- Platform plugin for Fast-reboot/warm-reboot (#740)

Signed-off-by: Danny Allen <[email protected]>
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
* Increase the watermark polling interval to 10s

Signed-off-by: Wenda <[email protected]>

* Update watermark test timing with 10s polling interval

Signed-off-by: Wenda <[email protected]>
dflynn-Nokia added a commit to dflynn-Nokia/sonic-buildimage that referenced this pull request Jan 29, 2021
This update includes the following changes

  > [syncd armhf] Fix syncd crash when running community test suites (sonic-net#777)
  > Revert "[tests]:Add unittest for MACsec on p2p establishment (sonic-net#771)"
  > [tests]:Add unittest for MACsec on p2p establishment (sonic-net#771)
  > [tests] Enable azure pipeline make check to respect unittests (sonic-net#760)
lguohan pushed a commit that referenced this pull request Jan 29, 2021
This update includes the following changes

  > [syncd armhf] Fix syncd crash when running community test suites (#777)
  > Revert "[tests]:Add unittest for MACsec on p2p establishment (#771)"
  > [tests]:Add unittest for MACsec on p2p establishment (#771)
  > [tests] Enable azure pipeline make check to respect unittests (#760)
lguohan pushed a commit that referenced this pull request Feb 3, 2021
This update includes the following changes

  > [syncd armhf] Fix syncd crash when running community test suites (#777)
  > Revert "[tests]:Add unittest for MACsec on p2p establishment (#771)"
  > [tests]:Add unittest for MACsec on p2p establishment (#771)
  > [tests] Enable azure pipeline make check to respect unittests (#760)
deran1980 pushed a commit to deran1980/sonic-buildimage that referenced this pull request Feb 4, 2021
This update includes the following changes

  > [syncd armhf] Fix syncd crash when running community test suites (sonic-net#777)
  > Revert "[tests]:Add unittest for MACsec on p2p establishment (sonic-net#771)"
  > [tests]:Add unittest for MACsec on p2p establishment (sonic-net#771)
  > [tests] Enable azure pipeline make check to respect unittests (sonic-net#760)
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
Add a "show platform fanstatus" command to allow user fetch FAN status data.
Add a "show platform temperature" command to allow user fetch thermal status data.
AidanCopeland pushed a commit to Metaswitch/sonic-buildimage that referenced this pull request Apr 14, 2022
…ic-net#777)

This commit fixes a syncd crash seen when running the sonic-mgmt comunity test
suites against the Marvell armhf platform. Analysis of the generated core file
points to improper format specifiers used when writing SWSS log entries. This
commit fixes that.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants