gerrit: bt2: add dev and prod mode

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 650ee2d69a751d448e7a9f9f8c281156e034b861..5de63d8148524954d440a6252526af86dc31b777 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -318,7 +318,7 @@
     node: 'master' # Applies only to matrix flyweight task
     execution-strategy:
       combination-filter: |
-        (build=="std" && conf=="python-bindings") || (arch=="amd64")
+        ((build=="std" && conf=="python-bindings" && bt2_mode=="std") || (arch=="amd64")) && (! (arch="amd64" && (build=="oot" || build=="dist") && bt2_mode=="dev"))
     axes:
       - axis:
          type: slave
@@ -332,6 +332,10 @@
          type: user-defined
          name: build
          values: '{obj:build}'
+      - axis:
+         type: user-defined
+         name: bt2_mode
+         values: '{obj:bt2_mode}'
 
     <<: *babeltrace_build_builders_defaults
     <<: *babeltrace_build_publishers_gerrit
@@ -669,3 +673,4 @@
           arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, python-bindings]
+          bt2_mode: !!python/tuple [dev, std]

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 8ef400830a81dc640b948d3658f928508561053b..da5f4ab96ff4ec1aa46a74e75ec5b97abbf72e66 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -74,6 +74,7 @@ arch=${arch:-}
 conf=${conf:-}
 build=${build:-}
 cc=${cc:-}
+bt2_mode=${bt2_mode:-}
 
 
 SRCDIR="$WORKSPACE/src/babeltrace"
@@ -197,9 +198,18 @@ cd "$SRCDIR"
 eval "$(grep '^PACKAGE_VERSION=' ./configure)"
 
 # Enable dev mode by default for BT 2.0 builds
-export BABELTRACE_DEBUG_MODE=1
-export BABELTRACE_DEV_MODE=1
-export BABELTRACE_MINIMAL_LOG_LEVEL=VERBOSE
+case "$bt2_mode" in
+dev)
+    echo "Developer mode"
+    export BABELTRACE_DEBUG_MODE=1
+    export BABELTRACE_DEV_MODE=1
+    export BABELTRACE_MINIMAL_LOG_LEVEL=VERBOSE
+    ;;
+*)
+    echo "Production mode (Default)"
+    export BABELTRACE_MINIMAL_LOG_LEVEL=INFO
+    ;;
+esac
 
 # Set configure options for each build configuration
 CONF_OPTS=""