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

[vs tests] Disable NAT tests to unblock Jenkins #1179

Merged
merged 2 commits into from
Jan 23, 2020

Conversation

daall
Copy link
Contributor

@daall daall commented Jan 22, 2020

Signed-off-by: Danny Allen daall@microsoft.com

What I did
Disabled NAT tests.

Why I did it
All Jenkins builds in swss and utilities have been failing for the past 4 days with the following error:

            if started > timeout:
>               raise ValueError(out)
E               ValueError: arp_update                       STOPPED   Not started
E               bgpd                             STOPPED   Not started
E               buffermgrd                       RUNNING   pid 594, uptime 0:01:10
E               fpmsyncd                         RUNNING   pid 390, uptime 0:01:22
E               intfmgrd                         RUNNING   pid 547, uptime 0:01:16
E               nbrmgrd                          RUNNING   pid 602, uptime 0:01:09
E               neighsyncd                       RUNNING   pid 344, uptime 0:01:25
E               orchagent                        RUNNING   pid 151, uptime 0:01:28
E               portmgrd                         RUNNING   pid 414, uptime 0:01:18
E               portsyncd                        RUNNING   pid 189, uptime 0:01:27
E               redis-server                     RUNNING   pid 87, uptime 0:01:30
E               restore_neighbors                STOPPED   Not started
E               rsyslogd                         RUNNING   pid 53, uptime 0:01:32
E               sflowmgrd                        RUNNING   pid 615, uptime 0:01:06
E               start.sh                         EXITED    Jan 22 10:29 PM
E               staticd                          RUNNING   pid 581, uptime 0:01:12
E               syncd                            RUNNING   pid 119, uptime 0:01:29
E               teammgrd                         RUNNING   pid 398, uptime 0:01:20
E               teamsyncd                        RUNNING   pid 367, uptime 0:01:24
E               vlanmgrd                         RUNNING   pid 559, uptime 0:01:15
E               vrfmgrd                          RUNNING   pid 406, uptime 0:01:19
E               vxlanmgrd                        RUNNING   pid 605, uptime 0:01:08
E               zebra                            RUNNING   pid 572, uptime 0:01:13

conftest.py:288: ValueError

This is because natmgrd and natsyncd were added to the process list that check_ready() is searching for to verify that the vs docker is up and running. However, the PR that activates these two processes in the SONiC image (sonic-net/sonic-buildimage#3494) is not merged yet. This PR needs to be merged before conftest can be updated and the NAT tests can be enabled.

How I verified it
I ran the tests locally and they now proceed as normal.

Details if related
Opened #1178 for tracking.

Signed-off-by: Danny Allen <daall@microsoft.com>
yxieca
yxieca previously approved these changes Jan 23, 2020
@yxieca yxieca self-requested a review January 23, 2020 16:11
@yxieca
Copy link
Contributor

yxieca commented Jan 23, 2020

Why is it necessary to comment out the actual test file as well? Would comment out test invoke enough?

Is there a better way of commenting out the whole file, like ''' / '''?

If the intention is to revert this change as whole when the buildimage change is in, then I would say delete the affected test files for now.

@daall
Copy link
Contributor Author

daall commented Jan 23, 2020

Why is it necessary to comment out the actual test file as well? Would comment out test invoke enough?

Is there a better way of commenting out the whole file, like ''' / '''?

If the intention is to revert this change as whole when the buildimage change is in, then I would say delete the affected test files for now.

Actually, pytest has a built-in skip fixture that we could use for now. That might be the best option as we can provide a reason for the skip, so if we look at the test output it will say something like "SKIPPED - Requires changes in buildimage." I feel like this is a good compromise as we'll still have a very obvious record of these tests existing, but the test suite won't be negatively impacted.

@daall daall merged commit 10f091d into sonic-net:master Jan 23, 2020
@daall daall deleted the disable_nat_tests branch January 23, 2020 23:27
lguohan pushed a commit that referenced this pull request Jan 30, 2020
Signed-off-by: Danny Allen <daall@microsoft.com>
oleksandrivantsiv pushed a commit to oleksandrivantsiv/sonic-swss that referenced this pull request Mar 1, 2023
What I did:

Moved the SAI header to v1.8.1.
   7cd3a7ed84db3fc9cec13496a5339b6fe1888bb7 (HEAD, tag: v1.8.1, origin/v1.8) Update SAI version to V1.8.1 (sonic-net#1218)
   5913e4cdd0c9c7ae859baa2e18086327b39a94da Fix error when compiling Broadcom SAI with v1.8.0 (sonic-net#1216)
   5a98bc3c7e86c01f3cf702054f9af7c7c5ca6daf (HEAD, tag: v1.8.0, origin/master, origin/HEAD, master) Update version to 1.8.0 (sonic-net#1207)
   b3244ceceb45184ffe37da55bb9a98ef126050ce saineighbor.h: Updated SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_INDEX and deprecated SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_IMPOSE_INDEX (sonic-net#1202)
   8731ca6e09c7ba99b0b009e5821d80598e216756 Add source/dest/double NAPT entry available attributes (sonic-net#1194)
   f053d899feb9517f2db43ee462589a30572b5ed1 Add switch attributes for hash offset configuration. (sonic-net#1195)
   13e5cd6940f9a0da1878d00f08e5941e09f16e7f PRBS RX State Data Type (sonic-net#1179)
   9755845a06525a3c17f03e7b936a70783e8ef068 Packet header based VRF classification (sonic-net#1185)
   2369ecb59fff1a5cae948d41eea06bf8b71330b2 SAI versioning (sonic-net#1183)
   744279839c176e68b19734657975e3f5ec6f1a32 Replaced SAI_SWITCH_ATTR_MACSEC_OBJECT_ID with SAI_SWITCH_ATTR_MACSEC_OBJECT_LIST (sonic-net#1199)
   584c724864fe565357e82d097ddcc7363bddefac [CI] Set up CI&PR with Azure Pipelines (sonic-net#1200)
   08192237963174cc60edae9b4812a39c43b291fd Add attribute to query available packet DMA pool size (sonic-net#1198)
   f092ef1e3ce695fc3f9552721025695312b961a2 Add IPv6 flow label hash attribute. (sonic-net#1192)
   cbc9562bb7a8f2c3a79702b99be55f3b3afa6957 Override VRF (sonic-net#1186)
   1eb35afdb2146baf40e6c2b8f2f8bfe99075eaee Add SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO format for GB MDIO sysfs access   (sonic-net#1171)
   b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (sonic-net#1173)
   96adc95bf8316e1905143d9ecd21f32a43e80d7f Enhancements for MPLS support (sonic-net#1181)
   3dcf1f2028da4060b345ad78e8a0c87d225bf5d0 Support for ACL extensions in metadata (sonic-net#1178)
   24076be95b871e8f82ecaeb908cad951dc68896c [meta] Add support for allow empty list tag (sonic-net#1190)
   a2b3344cdde0bf5a4f8e98e1c676a658c0c615b0 spell check fixes (sonic-net#1189)
   bf4271bab6e8884bd96050bcba44e3134adaaec3 Do not call sai_metadata_sai get APIs before checking if they are allocated (sonic-net#1182)
   5d5784dc3dbfc713c92ae7d2c472680b837bb002 [macsec]: Separate XPN configuration attribute from read-only attribute (sonic-net#1169)
   6d5a9bf5ad17cb82621cabbe2449524320930606 [macsec]: add SAI_MACSEC_ATTR_SUPPORTED_CIPHER_SUITE_LIST (sonic-net#1172)
   e72c8f3a0cc543cb228554be82c97a63db917740 [meta] Print each tool version in Makefile (sonic-net#1177)
   8f19677da88c7494d563ef7c5acb0529ecbd0b6e [meta] Add check for START, END and RANBE_BASE enums (sonic-net#1175)
   24ad7906f145930b2e25682b6248909289d39e72 [meta] Create sai_switch_pointers_t struct (sonic-net#1174)
   4f5f84df3fcd0e146707df41d3e2837c48f7c760 Tunnel loopback packet action as resource (sonic-net#1163)
   8a0e82c57aa0e22e696158735516904e7dc14052 [meta] Add create only oid attribute check on switch object (sonic-net#1170)
   14cf50772e478551920963ecf11f4fd019a0c106 Remove obsolete stub folder (sonic-net#1168)
   f14f406340e4f5f1b1d674f6fdd5fd861a54c877 [meta] Use safer calloc for integer overflow check (sonic-net#1166)

Also this PR include changes of this sonic-net#815

SAI commit b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (sonic-net#1173) needed change in sai_redis_switch.cpp and sai_vs_switch.cpp for compilation.

How I verify:

Verify Build is fine of libsairedis*.deb, syncd*.deb, swss*.deb

Co-authored-by: Ann Pokora <apokora@juniper.net>
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