jjb: Convert bt2 prod to configuration

Let's try to limit the matrix size, this is definatly a configuration.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 5de63d8148524954d440a6252526af86dc31b777..dfd7e0eef114938a62cb5b8648177538ab597fab 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" && bt2_mode=="std") || (arch=="amd64")) && (! (arch="amd64" && (build=="oot" || build=="dist") && bt2_mode=="dev"))
+        (build=="std" && conf=="python-bindings") || (arch=="amd64")
     axes:
       - axis:
          type: slave
@@ -332,10 +332,6 @@
          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
@@ -672,5 +668,4 @@
           buildtype: build
           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]
+          conf: !!python/tuple [std, python-bindings, production]

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index da5f4ab96ff4ec1aa46a74e75ec5b97abbf72e66..8f9d23f4a1feb391caf4c0d4852e8db86b954b97 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -74,7 +74,6 @@ arch=${arch:-}
 conf=${conf:-}
 build=${build:-}
 cc=${cc:-}
-bt2_mode=${bt2_mode:-}
 
 
 SRCDIR="$WORKSPACE/src/babeltrace"
@@ -198,18 +197,9 @@ cd "$SRCDIR"
 eval "$(grep '^PACKAGE_VERSION=' ./configure)"
 
 # Enable dev mode by default for BT 2.0 builds
-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
+export BABELTRACE_DEBUG_MODE=1
+export BABELTRACE_DEV_MODE=1
+export BABELTRACE_MINIMAL_LOG_LEVEL=VERBOSE
 
 # Set configure options for each build configuration
 CONF_OPTS=""
@@ -232,6 +222,19 @@ python-bindings)
         CONF_OPTS="${CONF_OPTS} --enable-python-bindings-doc --enable-python-plugins"
     fi
     ;;
+production)
+    echo "Production build"
+
+    # Unset the developper variables
+    unset BABELTRACE_DEBUG_MODE
+    unset BABELTRACE_DEV_MODE
+    unset BABELTRACE_MINIMAL_LOG_LEVEL
+
+    # Enable the python bindings
+    export PYTHON="python3"
+    export PYTHON_CONFIG="/usr/bin/python3-config"
+    CONF_OPTS="--enable-python-bindings --enable-python-bindings-doc --enable-python-plugins"
+    ;;
 *)
     echo "Standard build"
     CONF_OPTS=""