From 1dddcbebeffb85234dc2195c00ccd09b839404bf Mon Sep 17 00:00:00 2001
From: RedLeaderOne <luc.coupal.1@ulaval.ca>
Date: Wed, 5 Jun 2024 12:17:54 -0400
Subject: [PATCH] ci: fix build system standalone dependencies installer and
 run config mod

---
 .../.jetbrains_run_config/[LPM] run all bats tests.run.xml   | 2 +-
 ...atrix.bash \342\200\272  build _service_ _popup_.run.xml" | 2 +-
 ...build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml" | 4 ++--
 ...ncies-general dependencies (BUILD MATRIX SUBSET).run.xml" | 4 ++--
 ... \342\200\272 build test_compilation__ (Release).run.xml" | 4 ++--
 ..._compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml" | 4 ++--
 ...ush dependencies-general dependencies (AS IN TC).run.xml" | 2 +-
 .../test_execute_compose_over_build_matrix.bash.run.xml      | 2 +-
 ..._execute_compose_over_build_matrix_with_flag.bash.run.xml | 2 +-
 .../tests_docker_interactive/Dockerfile.build_system_test    | 3 ++-
 .../ubuntu/lpm_install_dependencies_general_ubuntu.bash      | 5 ++++-
 build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash  | 4 ++++
 12 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/build_system/.jetbrains_run_config/[LPM] run all bats tests.run.xml b/build_system/.jetbrains_run_config/[LPM] run all bats tests.run.xml
index c976ae38..a54069bd 100644
--- a/build_system/.jetbrains_run_config/[LPM] run all bats tests.run.xml	
+++ b/build_system/.jetbrains_run_config/[LPM] run all bats tests.run.xml	
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="DOCKER_CONTEXT" value="desktop-linux" />
diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272  build _service_ _popup_.run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272  build _service_ _popup_.run.xml"
index 35bfd93e..83b4f1c5 100644
--- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272  build _service_ _popup_.run.xml"	
+++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272  build _service_ _popup_.run.xml"	
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272  build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272  build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml"
index 6b7fc9c7..9e65fc21 100644
--- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272  build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml"	
+++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272  build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml"	
@@ -9,11 +9,11 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
     </envs>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml"
index 9cc3dd81..d2e7dd3e 100644
--- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml"	
+++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml"	
@@ -9,11 +9,11 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
     </envs>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation__ (Release).run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation__ (Release).run.xml"
index c7fab276..ba38cc0d 100644
--- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation__ (Release).run.xml"	
+++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation__ (Release).run.xml"	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="bash lpm_crawl_libpointmatcher_build_matrix.bash › build test_compilation_* (compilation test)" type="ShConfigurationType" folderName="[LPM] C | Execute compose over build matrix">
-    <option name="SCRIPT_TEXT" value="bash lpm_crawl_libpointmatcher_build_matrix.bash --fail-fast --cmake-build-type-build-matrix-override Release --os-name-build-matrix-override ubuntu --ubuntu-version-build-matrix-override jammy -- build test_compilation_prefixed_path test_compilation_auto_path_resolution" />
+    <option name="SCRIPT_TEXT" value="bash lpm_crawl_libpointmatcher_build_matrix.bash --fail-fast --cmake-build-type-build-matrix-override Release --os-name-build-matrix-override ubuntu --ubuntu-version-build-matrix-override focal -- build test_compilation_prefixed_path test_compilation_auto_path_resolution" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml"
index c23d7b5f..2f88eb98 100644
--- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml"	
+++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml"	
@@ -9,11 +9,11 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
     </envs>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build&push dependencies-general dependencies (AS IN TC).run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build&push dependencies-general dependencies (AS IN TC).run.xml"
index bf5e3c73..4570df53 100644
--- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build&push dependencies-general dependencies (AS IN TC).run.xml"	
+++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build&push dependencies-general dependencies (AS IN TC).run.xml"	
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
diff --git a/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix.bash.run.xml b/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix.bash.run.xml
index 33946fed..e72fd636 100644
--- a/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix.bash.run.xml
+++ b/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix.bash.run.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs />
     <method v="2" />
diff --git a/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix_with_flag.bash.run.xml b/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix_with_flag.bash.run.xml
index 2c8ac9f7..3cf0ad4f 100644
--- a/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix_with_flag.bash.run.xml
+++ b/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix_with_flag.bash.run.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs />
     <method v="2" />
diff --git a/build_system/tests/tests_docker_interactive/Dockerfile.build_system_test b/build_system/tests/tests_docker_interactive/Dockerfile.build_system_test
index 0d6318dc..a7315946 100644
--- a/build_system/tests/tests_docker_interactive/Dockerfile.build_system_test
+++ b/build_system/tests/tests_docker_interactive/Dockerfile.build_system_test
@@ -1,5 +1,6 @@
 ARG BASE_IMAGE=ubuntu
-ARG BASE_IMAGE_TAG=jammy
+#ARG BASE_IMAGE_TAG=jammy
+ARG BASE_IMAGE_TAG=bionic
 FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS base-image
 
 LABEL org.opencontainers.image.authors="luc.coupal.1@ulaval.ca"
diff --git a/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash b/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash
index 8a0f74cc..d857060d 100644
--- a/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash
+++ b/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash
@@ -20,6 +20,9 @@ TMP_CWD=$(pwd)
 LPM_PATH=$(git rev-parse --show-toplevel)
 cd "${LPM_PATH}/build_system" || cd "${LPM_PATH}" || exit 1
 
+NBS_PATH=${NBS_PATH:-"${LPM_PATH}/build_system/utilities/norlab-build-system"}
+N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+
 # ....Load environment variables from file.........................................................
 set -o allexport
 source .env
@@ -27,9 +30,9 @@ set +o allexport
 
 # ....Helper function..............................................................................
 # import shell functions from utilities library
-N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
 source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
+
 # Set environment variable IMAGE_ARCH_AND_OS
 cd "${N2ST_PATH}"/src/utility_scripts/ && source "which_architecture_and_os.bash"
 
diff --git a/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash b/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash
index bfd5b710..ef5f61c3 100644
--- a/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash
+++ b/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash
@@ -218,6 +218,10 @@ if [[ $TEST_RUN  == true ]]; then
   BUILD_EXIT_CODE=0
   INSTALL_EXIT_CODE=0
 else
+  #  # Hack to prevent LPM cmake build failure in ubuntu bionic
+  #  BOOST_ROOT=$(whereis boost) && export BOOST_ROOT
+  #  CMAKE_FLAGS=( -D BOOST_ROOT="$BOOST_ROOT" "${CMAKE_FLAGS[@]}" )
+
   cmake "${CMAKE_FLAGS[@]}" "${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}"
 
   BUILD_EXIT_CODE=$?