Merge branch 'loxilb-io:main' into main

nik-netlox · Mar 12, 2024 · b3950f5 · b3950f5
2 parents e12244d + 357e491
commit b3950f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
@@ -48,7 +48,7 @@ jobs:
       - run: sudo -E env "PATH=$PATH" make
       - run: docker pull ghcr.io/loxilb-io/loxilb:latest
       - run: docker run -u root --cap-add SYS_ADMIN   --restart unless-stopped --privileged -dit -v /dev/log:/dev/log --name loxilb ghcr.io/loxilb-io/loxilb:latest
-      - run: pwd && ls && sudo -E env "PATH=$PATH" make docker-cp
+      - run: pwd && ls && sudo -E env "PATH=$PATH" make docker-cp-ebpf
       - run: id=`docker ps -f name=loxilb | cut  -d " "  -f 1 | grep -iv  "CONTAINER"` && docker commit $id ghcr.io/loxilb-io/loxilb:latest
       - run: docker stop loxilb && docker rm loxilb
       - run: |

diff --git a/cicd/tcpsctpperf/validation.sh b/cicd/tcpsctpperf/validation.sh
@@ -19,7 +19,7 @@ echo -e "\n\nIPERF Test - Threads: $threads  Duration: $time"
 echo "*********************************************************************"
 $hexec l3ep1 iperf -s -p 12865 2>&1 > /dev/null &
 $hexec l3ep1 iperf3 -s -p 13866 --logfile iperf3s.log 2>&1> /dev/null &
-sleep 2
+sleep 10
 $hexec l3h1 ./iperf.sh $threads $time
 sudo pkill iperf 2>&1>/dev/null
 sudo rm iperf3s.log
@@ -29,7 +29,7 @@ sleep 2
 $hexec l3ep1 ./netserver -4 -p 12865
 echo -e "\n\nNETPERF Test - Threads: $threads  Duration: $time"
 echo "*********************************************************************"
-sleep 2
+sleep 10
 $hexec l3h1 ./netperf.sh $threads $time
 sudo pkill netserver
 
@@ -59,7 +59,7 @@ echo -e "\n\nIPERF Test - Threads: $threads  Duration: $time"
 echo "*********************************************************************"
 $hexec l3ep1 iperf -s -p 12865 2>&1 > /dev/null &
 $hexec l3ep1 iperf3 -s -p 13866 --logfile iperf3s.log 2>&1> /dev/null &
-sleep 2
+sleep 10
 $hexec l3h1 ./iperf.sh $threads $time
 sudo pkill iperf 2>&1>/dev/null
 sudo rm iperf3s.log
@@ -69,14 +69,12 @@ sleep 2
 $hexec l3ep1 ./netserver -4 -p 12865
 echo -e "\n\nNETPERF Test - Threads: $threads  Duration: $time"
 echo "*********************************************************************"
-sleep 2
+sleep 10
 $hexec l3h1 ./netperf.sh $threads $time
 sudo pkill netserver
 
 #netserver somehow corrupts /dev/null, so we have to create it again
 sudo rm -f /dev/null; sudo mknod -m 666 /dev/null c 1 3
 echo "*********************************************************************"
 
-
-
 echo SCENARIO-tcpsctpperf [OK]