-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Add missing timestamp in docker meta label tag value #2194
Conversation
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
slave.mk
Outdated
@@ -9,7 +9,7 @@ SHELL = /bin/bash | |||
USER = $(shell id -un) | |||
UID = $(shell id -u) | |||
GUID = $(shell id -g) | |||
SONIC_GET_VERSION=$(shell . functions.sh && sonic_get_version) | |||
SONIC_GET_VERSION=$(shell export BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) && . functions.sh && sonic_get_version) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you move the export in sonic_get_version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did try that, it didn't seem to work.
Printing out SONIC_GET_VERSION for debugging:
$(info "SONIC_GET_VERSION" : "$(SONIC_GET_VERSION)")
jipan@sonicvm1:~/warm_reboot/sonic-buildimage$ make target/docker-orchagent-brcm.gz-clean
+++ --- Making target/docker-orchagent-brcm.gz-clean --- +++
BLDENV=stretch make -f Makefile.work stretch
make[1]: Entering directory '/home/jipan/warm_reboot/sonic-buildimage'
SONiC Build System
Build Configuration
"CONFIGURED_PLATFORM" : "broadcom"
"SONIC_CONFIG_PRINT_DEPENDENCIES" : ""
"SONIC_BUILD_JOBS" : "1"
"SONIC_CONFIG_MAKE_JOBS" : "8"
"USERNAME" : "admin"
"PASSWORD" : "admin"
"ENABLE_DHCP_GRAPH_SERVICE" : ""
"SHUTDOWN_BGP_ON_START" : ""
"ENABLE_PFCWD_ON_START" : ""
"INSTALL_DEBUG_TOOLS" : ""
"ROUTING_STACK" : "frr"
"ENABLE_SYNCD_RPC" : ""
"ENABLE_ORGANIZATION_EXTENSIONS" : "y"
"HTTP_PROXY" : ""
"HTTPS_PROXY" : ""
"ENABLE_SYSTEM_TELEMETRY" : "y"
"SONIC_DEBUGGING_ON" : "y"
"SONIC_PROFILING_ON" : ""
"KERNEL_PROCURE_METHOD" : "build"
"BUILD_TIMESTAMP" : "20181026.123301"
"SONIC_GET_VERSION" : "warm-reboot.0-dirty-"
With current version:
jipan@sonicvm1:~/warm_reboot/sonic-buildimage$ make target/docker-orchagent-brcm.gz-clean
+++ --- Making target/docker-orchagent-brcm.gz-clean --- +++
BLDENV=stretch make -f Makefile.work stretch
make[1]: Entering directory '/home/jipan/warm_reboot/sonic-buildimage'
SONiC Build System
Build Configuration
"CONFIGURED_PLATFORM" : "broadcom"
"SONIC_CONFIG_PRINT_DEPENDENCIES" : ""
"SONIC_BUILD_JOBS" : "1"
"SONIC_CONFIG_MAKE_JOBS" : "8"
"USERNAME" : "admin"
"PASSWORD" : "admin"
"ENABLE_DHCP_GRAPH_SERVICE" : ""
"SHUTDOWN_BGP_ON_START" : ""
"ENABLE_PFCWD_ON_START" : ""
"INSTALL_DEBUG_TOOLS" : ""
"ROUTING_STACK" : "frr"
"ENABLE_SYNCD_RPC" : ""
"ENABLE_ORGANIZATION_EXTENSIONS" : "y"
"HTTP_PROXY" : ""
"HTTPS_PROXY" : ""
"ENABLE_SYSTEM_TELEMETRY" : "y"
"SONIC_DEBUGGING_ON" : "y"
"SONIC_PROFILING_ON" : ""
"KERNEL_PROCURE_METHOD" : "build"
"BUILD_TIMESTAMP" : "20181026.123233"
"SONIC_GET_VERSION" : "warm-reboot.0-dirty-20181026.123233"
Signed-off-by: Guohan Lu <gulv@microsoft.com>
Update sonic-swss submodule pointer to include the following: * Dynamic port configuration - add port buffer cfg to the port ref counter ([sonic-net#2194](sonic-net/sonic-swss#2194)) * tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE ([sonic-net#2408](sonic-net/sonic-swss#2408)) * [counters] Improve performance by polling only configured ports buffer queue/pg counters ([sonic-net#2360](sonic-net/sonic-swss#2360)) * added support for Xsight platform ([sonic-net#2426](sonic-net/sonic-swss#2426)) * [ci][asan] add DVS tests run with ASAN ([sonic-net#2363](sonic-net/sonic-swss#2363)) * Handle dual ToR neighbor miss scenario ([sonic-net#2151](sonic-net/sonic-swss#2151)) * Upstream new development on p4orch ([sonic-net#2237](sonic-net/sonic-swss#2237)) * [lgtm] Fix dependency ([sonic-net#2419](sonic-net/sonic-swss#2419)) * [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() ([sonic-net#2415](sonic-net/sonic-swss#2415)) * [macsec]: Set MTU for MACsec ([sonic-net#2398](sonic-net/sonic-swss#2398)) * Delete Invalid if condition in intfsorch.cpp ([sonic-net#2411](sonic-net/sonic-swss#2411)) Signed-off-by: dprital <drorp@nvidia.com>
utilities: * 5892f6d 2022-08-29 | [VRF]Adding CLI checks to ensure Vrf is valid in interface bind and static route commands (sonic-net#2333) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * 87ec859 2022-08-30 | Subinterface vrf bind issue fix (sonic-net#2211) [Preetham] * edc0169 2022-08-16 | [decode-syseeprom] Fix setting use_db based on support_eeprom_db (sonic-net#2270) [byu343] * 1542e7a 2022-08-15 | Fix vrf UT failed issue (sonic-net#2309) [Hua Liu] swss: * 39f5cdf 2022-08-31 | [BFD]Clean up state_db BFD entries on swss restart (sonic-net#2434) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * f4a6945 2022-08-30 | Fix the Fec Mode Setting of gbsyncd (sonic-net#2430) [abdosi] * 36e8092 2022-08-30 | [neighsyncd] Enabling ipv4 link local entries for non-dualtor (sonic-net#2427) [Nikola Dancejic] * a2bac7c 2022-08-26 | tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE (sonic-net#2408) [Preetham] * 8bb21be 2022-08-10 | PFCWD recovery changes using DLR_INIT (sonic-net#2316) [vmittal-msft] * 3e888b7 2022-08-29 | Dynamic port configuration - add port buffer cfg to the port ref counter (sonic-net#2194) [Dror Prital] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Update sonic-swss submodule pointer to include the following: * [BFD]Clean up state_db BFD entries on swss restart ([sonic-net#2434](sonic-net/sonic-swss#2434)) * Fix the Fec Mode Setting of gbsyncd ([sonic-net#2430](sonic-net/sonic-swss#2430)) * [neighsyncd] Enabling ipv4 link local entries for non-dualtor ([sonic-net#2427](sonic-net/sonic-swss#2427)) * tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE ([sonic-net#2408](sonic-net/sonic-swss#2408)) * PFCWD recovery changes using DLR_INIT ([sonic-net#2316](sonic-net/sonic-swss#2316)) * Dynamic port configuration - add port buffer cfg to the port ref counter ([sonic-net#2194](sonic-net/sonic-swss#2194)) Signed-off-by: dprital <drorp@nvidia.com>
Update sonic-swss submodule pointer to include the following: [BFD]Clean up state_db BFD entries on swss restart (#2434) Fix the Fec Mode Setting of gbsyncd (#2430) [neighsyncd] Enabling ipv4 link local entries for non-dualtor (#2427) tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE (#2408) PFCWD recovery changes using DLR_INIT (#2316) Dynamic port configuration - add port buffer cfg to the port ref counter (#2194) Signed-off-by: dprital <drorp@nvidia.com>
Include: df92fb7 Improve verbosity level and provide more info in the log (sonic-net#2472) e81ed20 [intfmgr]: Enable `accept_untracked_na` kernel param (sonic-net#2436) 24d29f1 [orchdaemon]: Fixed sairedis record file rotation (sonic-net#2299) b8ee07d [build] add missing package libyang-dev in lgtm.yml (sonic-net#2475) e46dd29 [crm] Fix issue with continues EXCEEDED and CLEAR logs for ACL group/table counters (sonic-net#2463) b61d24c [doc]: Update README.md (sonic-net#2456) b9ade5d [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (sonic-net#2461) f0f1eb4 Revert "[counters] Improve performance by polling only configured ports buffer queue/pg counters (sonic-net#2360)" (sonic-net#2458) 3d757a8 [ci][asan] add DVS tests run with ASAN (sonic-net#2441) 04fbc8e [ci] Only when test stage succeeded or succeededwithissues, PR run Gcov (sonic-net#2460) 7cc035f [orchagent]: Publish identified events via structured-events channel (sonic-net#2446) efa0f01 [QoS] Enforce drop probability only for colors whose WRED are enabled (sonic-net#2422) 05c5c2f [swss] Replace memset functions (sonic-net#2423) 9ff993d Modified the test file to remove click commands and do the REDIS-DB u… (sonic-net#2264) 9e376af Install libyang in azure pipeline. (sonic-net#2445) c1eb99a check state_db for po before sending ARP/ND pkts (sonic-net#2444) 43cc486 [portmgr] Fixed the orchagent crash due to late arrival of notif (sonic-net#2431) b62c716 Enhance orchagent and buffer manager in error handling (sonic-net#2414) 13bda3c [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (sonic-net#2392) 0ccb315 Revert "[VS Test] Skip failing subport tests (sonic-net#2370)" (sonic-net#2421) ac8a83f [UT] [Portsyncd] Added Unit Tests for portsyncd (sonic-net#2297) 83a186a Change the log messages in addKernelNeigh/Route from ERROR to INFO (sonic-net#2437) 9c23389 [BFD]Clean up state_db BFD entries on swss restart (sonic-net#2434) d41aebf EntityBulker SIGSEGV when create_entry attr_count 0 (sonic-net#2224) f52a7b1 Fix the Fec Mode Setting of gbsyncd (sonic-net#2430) 8cc0a45 [neighsyncd] Enabling ipv4 link local entries for non-dualtor (sonic-net#2427) 5624e87 Revert "[ci][asan] add DVS tests run with ASAN (sonic-net#2363)" (sonic-net#2433) a26b26a Dynamic port configuration - add port buffer cfg to the port ref counter (sonic-net#2194) 486939a tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE (sonic-net#2408) a4b8992 [counters] Improve performance by polling only configured ports buffer queue/pg counters (sonic-net#2360) 4aaeec9 added support for Xsight platform (sonic-net#2426) ca9edca [ci][asan] add DVS tests run with ASAN (sonic-net#2363) dec4570 Handle dual ToR neighbor miss scenario (sonic-net#2151) 9eb4422 Upstream new development on p4orch (sonic-net#2237) e9be2c0 [lgtm] Fix dependency (sonic-net#2419) c0168f3 [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() (sonic-net#2415) cfcf3d8 [macsec]: Set MTU for MACsec (sonic-net#2398) 8346034 Delete Invalid if condition in intfsorch.cpp (sonic-net#2411) Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
Include: df92fb7 Improve verbosity level and provide more info in the log (#2472) e81ed20 [intfmgr]: Enable `accept_untracked_na` kernel param (#2436) 24d29f1 [orchdaemon]: Fixed sairedis record file rotation (#2299) b8ee07d [build] add missing package libyang-dev in lgtm.yml (#2475) e46dd29 [crm] Fix issue with continues EXCEEDED and CLEAR logs for ACL group/table counters (#2463) b61d24c [doc]: Update README.md (#2456) b9ade5d [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (#2461) f0f1eb4 Revert "[counters] Improve performance by polling only configured ports buffer queue/pg counters (#2360)" (#2458) 3d757a8 [ci][asan] add DVS tests run with ASAN (#2441) 04fbc8e [ci] Only when test stage succeeded or succeededwithissues, PR run Gcov (#2460) 7cc035f [orchagent]: Publish identified events via structured-events channel (#2446) efa0f01 [QoS] Enforce drop probability only for colors whose WRED are enabled (#2422) 05c5c2f [swss] Replace memset functions (#2423) 9ff993d Modified the test file to remove click commands and do the REDIS-DB u… (#2264) 9e376af Install libyang in azure pipeline. (#2445) c1eb99a check state_db for po before sending ARP/ND pkts (#2444) 43cc486 [portmgr] Fixed the orchagent crash due to late arrival of notif (#2431) b62c716 Enhance orchagent and buffer manager in error handling (#2414) 13bda3c [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (#2392) 0ccb315 Revert "[VS Test] Skip failing subport tests (#2370)" (#2421) ac8a83f [UT] [Portsyncd] Added Unit Tests for portsyncd (#2297) 83a186a Change the log messages in addKernelNeigh/Route from ERROR to INFO (#2437) 9c23389 [BFD]Clean up state_db BFD entries on swss restart (#2434) d41aebf EntityBulker SIGSEGV when create_entry attr_count 0 (#2224) f52a7b1 Fix the Fec Mode Setting of gbsyncd (#2430) 8cc0a45 [neighsyncd] Enabling ipv4 link local entries for non-dualtor (#2427) 5624e87 Revert "[ci][asan] add DVS tests run with ASAN (#2363)" (#2433) a26b26a Dynamic port configuration - add port buffer cfg to the port ref counter (#2194) 486939a tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE (#2408) a4b8992 [counters] Improve performance by polling only configured ports buffer queue/pg counters (#2360) 4aaeec9 added support for Xsight platform (#2426) ca9edca [ci][asan] add DVS tests run with ASAN (#2363) dec4570 Handle dual ToR neighbor miss scenario (#2151) 9eb4422 Upstream new development on p4orch (#2237) e9be2c0 [lgtm] Fix dependency (#2419) c0168f3 [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() (#2415) cfcf3d8 [macsec]: Set MTU for MACsec (#2398) 8346034 Delete Invalid if condition in intfsorch.cpp (#2411) Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
Related work items: sonic-net#2151, sonic-net#2194, sonic-net#2224, sonic-net#2237, sonic-net#2264, sonic-net#2281, sonic-net#2286, sonic-net#2297, sonic-net#2299, sonic-net#2305, sonic-net#2325, sonic-net#2335, sonic-net#2338, sonic-net#2341, sonic-net#2343, sonic-net#2347, sonic-net#2350, sonic-net#2355, sonic-net#2356, sonic-net#2358, sonic-net#2360, sonic-net#2363, sonic-net#2367, sonic-net#2368, sonic-net#2370, sonic-net#2374, sonic-net#2392, sonic-net#2398, sonic-net#2408, sonic-net#2414, sonic-net#2415, sonic-net#2419, sonic-net#2421, sonic-net#2422, sonic-net#2423, sonic-net#2426, sonic-net#2427, sonic-net#2430, sonic-net#2431, sonic-net#2433, sonic-net#2434, sonic-net#2436, sonic-net#2437, sonic-net#2441, sonic-net#2444, sonic-net#2445, sonic-net#2446, sonic-net#2456, sonic-net#2458, sonic-net#2460, sonic-net#2461, sonic-net#2463, sonic-net#2472, sonic-net#2475, sonic-net#11877, sonic-net#12024, sonic-net#12065, sonic-net#12097, sonic-net#12130, sonic-net#12209, sonic-net#12217, sonic-net#12244, sonic-net#12251, sonic-net#12255, sonic-net#12276, sonic-net#12284
…ter (sonic-net#2194) - What I did This PR replace PR sonic-net#2022 Added increasing/decreasing to the port ref counter each time a port buffer configuration is added or removed Implemented according to the - sonic-net/SONiC#900 - Why I did it In order to avoid cases where a port is removed before the buffer configuration on this port were removed also - How I verified it VS Test was added in order to test it. we remove a port with buffer configuration and the port is not removed. only after all buffer configurations on this port were removed - this port will be removed.
Signed-off-by: Jipan Yang jipan.yang@alibaba-inc.com
- What I did
Timestamp is missing in tag value of docker meta labels
- How I did it
Fixed via adding " export BUILD_TIMESTAMP=$(BUILD_TIMESTAMP)" in SONIC_GET_VERSION
- How to verify it
Before the change, build timestamp was missing for teamd which had been upgraded successfully.
Tag value: warm-reboot.0-dirty-
After the fix, timestamp is available
Tag value: warm-reboot.0-dirty-20181024.161252