MDBF 143 - Added repository/env inputs to infer script

To allow DEV testing.

Author: RazvanLiviuVarzaru

configuration/steps/commands/scripts/infer.sh

@@ -14,6 +14,8 @@ fi
 
 # Testing this version
 branch=$1
+repository=${2:-"https://github.com/MariaDB/server.git"}
+environment=${3:-"PROD"}
 
 if [ -z "$branch" ]; then
   echo "usage $0 {branch/commit}" >&2
@@ -28,8 +30,8 @@ trap "cleanup_for_CI" EXIT
 
 base=$PWD
 result_dir=$PWD/infer_results
-infer="/mnt/infer"
-sources="/mnt/src/server"
+infer="/mnt/infer/$environment"
+sources="/mnt/src/$environment/server"
 # less than zabbix (80) warning.
 max_usage=75 # maximum disk usage (in percent)
 limit=50 # number of commits away to consider for a differential build/analysis
@@ -39,17 +41,22 @@ limit=50 # number of commits away to consider for a differential build/analysis
 ##                               FUNCTIONS                                    ##
 ################################################################################
 
+create_dirs()
+{
+  mkdir -p "$infer"
+  mkdir -p "$sources"
+}
+
 # Inputs: $branch
 # Postconditions:
 # * $sources is checked out to $branch
 # * $commit set to the reference
 get_source()
 {
-  [ -d "$sources" ] || mkdir "$sources"
-  pushd $sources
+  pushd "$sources"
   trap 'popd' RETURN
   if [ ! -d .git ]; then
-    git clone https://github.com/MariaDB/server.git .
+    git clone "$repository" .
   else
     git clean -df
   fi
@@ -193,7 +200,7 @@ capture()
 analyze()
 {
   analyze_cmd=(analyze --project-root "${sources}" --results-dir "${result_dir}" --max-jobs "${JOBS}" "$@")
-  if [ -f $sources/.infer/report-block-list.spec.json ]; then
+  if [ -f "$sources"/.infer/report-block-list.spec.json ]; then
     # fp reports
     analyze_cmd+=( --report-block-list-spec="${sources}"/.infer/report-block-list-spec.json )
   fi
@@ -280,7 +287,7 @@ differential_to_main_branch()
   source "$sources"/VERSION
   branch=${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}
 
-  pushd $sources
+  pushd "$sources"
   merge_base=$(git merge-base "origin/$branch" "$commit")
   #mapfile -t commits < <(git rev-list "${merge_base}..${commit}")
   popd
@@ -319,6 +326,7 @@ differential_to_main_branch()
 ##                               MAIN SCRIPT                                  ##
 ################################################################################
 
+create_dirs
 host_cleanup
 
 get_source

configuration/steps/commands/util.py

@@ -1,3 +1,4 @@
+import os
 from pathlib import PurePath
 
 from buildbot.plugins import util
@@ -182,5 +183,8 @@ class InferScript(BashScriptCommand):
 
     def __init__(self):
         branch = util.Interpolate("%(prop:branch)s")
-        super().__init__(script_name="infer.sh", args=[branch])
+        repository = util.Interpolate("%(prop:repository)s")
+        environment = os.environ.get("ENVIRON")
+        args = [branch, repository, environment]
+        super().__init__(script_name="infer.sh", args=args)
         self.name = "Run Infer"