not load dpapp/init.config

sonic-net · Nov 12, 2024 · d2d2123 · d2d2123
1 parent 1004eba
commit d2d2123
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/dash-bmv2-ci.yml b/.github/workflows/dash-bmv2-ci.yml
@@ -85,8 +85,6 @@ jobs:
       run:  DOCKER_FLAGS=$docker_fg_flags make saithrift-server
     - name: Generate saithrift-client local docker
       run:  DOCKER_FLAGS=$docker_fg_flags make docker-saithrift-client
-    - name: Run saithrift server
-      run:  DOCKER_FLAGS=$docker_bg_flags make run-saithrift-server
     - name: Run dpapp
       run:  |
         sleep 2 #wait a moment for saithrift-server ready
@@ -105,6 +103,8 @@ jobs:
         docker stats --no-stream
         docker top dash-dpapp-$USER
         docker logs -t dash-dpapp-$USER
+    - name: Run saithrift server
+      run:  DOCKER_FLAGS=$docker_bg_flags make run-saithrift-server
     - name: Run PTF Tests
       timeout-minutes: 10
       run:  DOCKER_FLAGS=$docker_fg_root_flags make run-saithrift-ptftests

diff --git a/dash-pipeline/dpapp/dpapp.sh b/dash-pipeline/dpapp/dpapp.sh
@@ -5,4 +5,5 @@
 sysctl vm.nr_hugepages=32
 sysctl vm.max_map_count=1548
 
-/usr/bin/vpp -c ${1:-/etc/vpp/startup.conf}
+
+while true; do sleep 2; done
diff --git a/dash-pipeline/dpapp/startup.conf b/dash-pipeline/dpapp/startup.conf
@@ -4,7 +4,6 @@ unix {
   full-coredump
   cli-listen /run/vpp/cli.sock
   gid vpp
-  startup-config /dash/dash-pipeline/dpapp/init.config
 }
 
 api-trace {
@@ -29,15 +28,8 @@ cpu {
   corelist-workers 2
 }
 
-dpdk {
-  no-pci
-}
-
 plugins {
   add-path /dash/dash-pipeline/dpapp/build/lib/vpp_plugins
   plugin default {disable}
-  plugin dpdk_plugin.so {enable}
-  plugin af_packet_plugin.so {enable}
-  plugin dash_plugin.so {enable}
 }