Merge branch 'dev' into beta

Author: RedLeader962

tests/stability_check/exec_build.all.bash

@@ -15,8 +15,12 @@ trap dna::test_teardown_callback EXIT
 
 # ====begin========================================================================================
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
-#bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.bash "$@" -- --no-cache
-bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.bash "$@"
+
+if [[ ${TEAMCITY_VERSION} ]] ; then
+  bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.bash "$@" -- --no-cache
+else
+  bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.bash "$@"
+fi
 
 # ....Teardown.....................................................................................
 # Handle by the trap command

tests/stability_check/exec_build.all.multiarch.bash

@@ -14,10 +14,13 @@ function dna::test_teardown_callback() {
 trap dna::test_teardown_callback EXIT
 
 # ====begin========================================================================================
-#set +e # dont exit right away on error
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
-#bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.multiarch.bash "$@" -- --no-cache
-bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.multiarch.bash "$@"
+
+if [[ ${TEAMCITY_VERSION} ]] ; then
+  bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.multiarch.bash --force-push-project-core "$@" -- --no-cache
+else
+  bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.multiarch.bash "$@"
+fi
 
 # ....Teardown.....................................................................................
 # Handle by the trap command

tests/tests_dryrun_and_tests_scripts/dryrun_build.all.bash

@@ -15,6 +15,6 @@ trap dna::test_teardown_callback EXIT
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
 
 # ====begin========================================================================================
-unset buildx_builder
+unset BUILDX_BUILDER
 bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.bash -- --dry-run
 

tests/tests_dryrun_and_tests_scripts/dryrun_build.all.multiarch.bash

@@ -15,6 +15,6 @@ trap dna::test_teardown_callback EXIT
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
 
 # ====begin========================================================================================
-unset buildx_builder
+unset BUILDX_BUILDER
 bash "${DNA_LIB_EXEC_PATH:?err}"/build.all.multiarch.bash -- --dry-run
 

tests/tests_dryrun_and_tests_scripts/dryrun_build.ci_tests.bash

@@ -15,6 +15,6 @@ trap dna::test_teardown_callback EXIT
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
 
 # ====begin========================================================================================
-unset buildx_builder
+unset BUILDX_BUILDER
 bash "${DNA_LIB_EXEC_PATH:?err}"/build.ci_tests.bash -- --dry-run
 

tests/tests_dryrun_and_tests_scripts/dryrun_build.ci_tests.multiarch.bash

@@ -15,6 +15,6 @@ trap dna::test_teardown_callback EXIT
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
 
 # ====begin========================================================================================
-unset buildx_builder
+unset BUILDX_BUILDER
 bash "${DNA_LIB_EXEC_PATH:?err}"/build.ci_tests.multiarch.bash -- --dry-run
 

tests/tests_dryrun_and_tests_scripts/dryrun_build.deploy.bash

@@ -15,6 +15,6 @@ trap dna::test_teardown_callback EXIT
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
 
 # ====begin========================================================================================
-unset buildx_builder
+unset BUILDX_BUILDER
 bash "${DNA_LIB_EXEC_PATH:?err}"/build.deploy.bash -- --dry-run
 

tests/tests_dryrun_and_tests_scripts/dryrun_build.develop.bash

@@ -15,6 +15,6 @@ trap dna::test_teardown_callback EXIT
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
 
 # ====begin========================================================================================
-unset buildx_builder
+unset BUILDX_BUILDER
 bash "${DNA_LIB_EXEC_PATH:?err}"/build.develop.bash -- --dry-run
 

tests/tests_dryrun_and_tests_scripts/test_build_and_run_ci_tests_script.bash

@@ -14,7 +14,7 @@ trap dna::test_teardown_callback EXIT
 
 
 # ====begin========================================================================================
-unset buildx_builder
+unset BUILDX_BUILDER
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
 bash "${DNA_LIB_EXEC_PATH:?err}"/build.ci_tests.bash
 

tests/tests_dryrun_and_tests_scripts/test_run.slurm.bash

@@ -20,7 +20,7 @@ trap dna::test_teardown_callback EXIT
 cd "${DNA_MOCK_SUPER_PROJECT_ROOT:?err}" || exit 1
 
 # ====begin========================================================================================
-unset buildx_builder
+unset BUILDX_BUILDER
 
 # Script locals env var
 declare -a run_slurm_flags=()