commit 76b77740d79261a3064f1e6d048d0dfd060d792e
author Matteo Scandolo <matteo.scandolo@gmail.com> Wed Sep 16 11:14:04 2020 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Wed Sep 16 11:14:04 2020 -0700
tree b074d0680ab1d73987875a7874d0cd6b88779c0e
parent 432958515599329032f32f0f59f05dcdbc7bc138

Fixing parameters in BBR pipiline

Change-Id: I0413e98ba53b861546649c7818d3c32f852283ca

VERSION

diff --git a/VERSION b/VERSION
index 7dea76e..d666bd4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.1
+1.0.2-dev

tests/bbr.groovy

diff --git a/tests/bbr.groovy b/tests/bbr.groovy
index 5223c40..5dbd9b8 100644
--- a/tests/bbr.groovy
+++ b/tests/bbr.groovy
@@ -43,7 +43,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 4 -onu 16" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-logLevel warn -enableperf -pon 4 -onu 16" make docker-run
             sleep 5
             ./bbr -pon 4 -onu 16 -logfile bbr_16_4.logs
             docker logs bbsim 2>&1 | tee bbsim_16_4.logs
@@ -57,7 +57,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 4 -onu 32" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-logLevel warn -enableperf -pon 4 -onu 32" make docker-run
             sleep 5
             ./bbr -pon 4 -onu 32 -logfile bbr_32_4.logs
             docker logs bbsim 2>&1 | tee bbsim_32_4.logs
@@ -71,7 +71,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 8 -onu 32" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-logLevel warn -enableperf -pon 8 -onu 32" make docker-run
             sleep 5
             ./bbr -pon 8 -onu 32 -logfile bbr_32_8.logs
             docker logs bbsim 2>&1 | tee bbsim_32_8.logs
@@ -85,7 +85,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 8 -onu 64" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-logLevel warn -enableperf -pon 8 -onu 64" make docker-run
             sleep 5
             ./bbr -pon 8 -onu 64 -logfile bbr_64_8.logs
             docker logs bbsim 2>&1 | tee bbsim_64_8.logs
@@ -99,7 +99,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 15 -onu 64" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-logLevel warn -enableperf -pon 15 -onu 64" make docker-run
             sleep 5
             ./bbr -pon 15 -onu 64 -logfile bbr_64_15.logs
             docker logs bbsim 2>&1 | tee bbsim_64_15.logs
@@ -154,8 +154,8 @@
     failure {
       sh '''
       docker logs bbsim 2>&1 | tee bbsim_failed.logs
-      docker cp bbsim:/var/lib/dhcp/dhcpd.leases dhcpd_leases_failed.logs
-      docker exec bbsim bbsimctl onu list > onu_list.logs
+      docker cp bbsim:/var/lib/dhcp/dhcpd.leases dhcpd_leases_failed.logs || true
+      docker exec bbsim bbsimctl onu list > onu_list.logs || true
       '''
     }
   }