Test CRM tests

azure-pipelines.yml

@@ -50,87 +50,6 @@ stages:
       archive_pytests: true
       archive_gcov: true
 
-- stage: BuildAsan
-  dependsOn: []
-  jobs:
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: amd64
-      pool: sonicbld
-      sonic_slave: sonic-slave-bullseye
-      common_lib_artifact_name: common-lib
-      swss_common_artifact_name: sonic-swss-common
-      sairedis_artifact_name: sonic-sairedis
-      artifact_name: sonic-swss-asan
-      asan: true
-
-- stage: BuildArm
-  dependsOn: Build
-  condition: succeeded('Build')
-  jobs:
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: armhf
-      timeout: 240
-      pool: sonicbld-armhf
-      sonic_slave: sonic-slave-bullseye-armhf
-      common_lib_artifact_name: common-lib.armhf
-      swss_common_artifact_name: sonic-swss-common.armhf
-      sairedis_artifact_name: sonic-sairedis.armhf
-      artifact_name: sonic-swss.armhf
-      archive_gcov: false
-
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: arm64
-      timeout: 240
-      pool: sonicbld-arm64
-      sonic_slave: sonic-slave-bullseye-arm64
-      common_lib_artifact_name: common-lib.arm64
-      swss_common_artifact_name: sonic-swss-common.arm64
-      sairedis_artifact_name: sonic-sairedis.arm64
-      artifact_name: sonic-swss.arm64
-      archive_gcov: false
-
-- stage: BuildBookworm
-  dependsOn: BuildArm
-  condition: succeeded('BuildArm')
-  jobs:
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: amd64
-      pool: sonicbld
-      sonic_slave: sonic-slave-bookworm
-      common_lib_artifact_name: common-lib
-      swss_common_artifact_name: sonic-swss-common-bookworm
-      sairedis_artifact_name: sonic-sairedis-bookworm
-      artifact_name: sonic-swss-bookworm
-      archive_gcov: false
-
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: armhf
-      timeout: 240
-      pool: sonicbld-armhf
-      sonic_slave: sonic-slave-bookworm-armhf
-      common_lib_artifact_name: common-lib.armhf
-      swss_common_artifact_name: sonic-swss-common-bookworm.armhf
-      sairedis_artifact_name: sonic-sairedis-bookworm.armhf
-      artifact_name: sonic-swss-bookworm.armhf
-      archive_gcov: false
-
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: arm64
-      timeout: 240
-      pool: sonicbld-arm64
-      sonic_slave: sonic-slave-bookworm-arm64
-      common_lib_artifact_name: common-lib.arm64
-      swss_common_artifact_name: sonic-swss-common-bookworm.arm64
-      sairedis_artifact_name: sonic-sairedis-bookworm.arm64
-      artifact_name: sonic-swss-bookworm.arm64
-      archive_gcov: false
-
 - stage: BuildDocker
   dependsOn: Build
   condition: succeeded('Build')
@@ -142,18 +61,6 @@ stages:
       swss_artifact_name: sonic-swss
       artifact_name: docker-sonic-vs
 
-- stage: BuildDockerAsan
-  dependsOn: BuildAsan
-  condition: succeeded('BuildAsan')
-  jobs:
-  - template: .azure-pipelines/build-docker-sonic-vs-template.yml
-    parameters:
-      swss_common_artifact_name: sonic-swss-common
-      sairedis_artifact_name: sonic-sairedis
-      swss_artifact_name: sonic-swss-asan
-      artifact_name: docker-sonic-vs-asan
-      asan: true
-
 - stage: Test
   dependsOn: BuildDocker
   condition: succeeded('BuildDocker')
@@ -164,29 +71,3 @@ stages:
       gcov_artifact_name: sonic-gcov
       sonic_slave: sonic-slave-bullseye
       archive_gcov: true
-
-- stage: TestAsan
-  dependsOn: BuildDockerAsan
-  condition: succeeded('BuildDockerAsan')
-  jobs:
-  - template: .azure-pipelines/test-docker-sonic-vs-template.yml
-    parameters:
-      log_artifact_name: log-asan
-      gcov_artifact_name: sonic-gcov
-      sonic_slave: sonic-slave-bullseye
-      docker_sonic_vs_name: docker-sonic-vs-asan
-      asan: true
-
-- stage: Gcov
-  condition: false
-  dependsOn: Test
-  jobs:
-  - template: .azure-pipelines/gcov.yml
-    parameters:
-      arch: amd64
-      sonic_slave: sonic-slave-bullseye
-      swss_common_artifact_name: sonic-swss-common
-      sairedis_artifact_name: sonic-sairedis
-      swss_artifact_name: sonic-swss
-      artifact_name: sonic-gcov
-      archive_gcov: true

configure.ac

@@ -159,11 +159,7 @@ AC_CONFIG_FILES([
     swssconfig/Makefile
     cfgmgr/Makefile
     tests/Makefile
-    orchagent/p4orch/tests/Makefile
 ])
 
-# If no SAI library is installed, compile with SAIVS and run unit tests
-AM_COND_IF([HAVE_SAI],[],
-           [AC_CONFIG_FILES([tests/mock_tests/Makefile])])
 
 AC_OUTPUT

orchagent/Makefile.am

@@ -8,10 +8,6 @@ INCLUDES = -I $(top_srcdir)/lib \
            -I pbh \
            -I nhg
 
-if GCOV_ENABLED
-SUBDIRS = p4orch/tests
-endif
-
 CFLAGS_SAI = -I /usr/include/sai
 
 swssdir = $(datadir)/swss

orchagent/port/porthlpr.cpp

@@ -998,7 +998,8 @@ bool PortHelper::parsePortConfig(PortConfig &port) const
         }
         else
         {
-            SWSS_LOG_WARN("Unknown field(%s): skipping ...", field.c_str());
+            // XXX disable subport
+           // SWSS_LOG_WARN("Unknown field(%s): skipping ...", field.c_str());
         }
     }
 

tests/Makefile.am

@@ -4,10 +4,6 @@ CFLAGS_SAI = -I /usr/include/sai
 
 TESTS = tests
 
-if !HAVE_SAI
-SUBDIRS = mock_tests
-endif
-
 noinst_PROGRAMS = tests
 
 if DEBUG