Commit ca5c388f authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'reduce-console-log' into 'main' 

Reduce console log even more

See merge request !86
parents c05063f8 5dccc624

includes/default-variables.yml

+8 −0
Original line number Diff line number Diff line
@@ -28,3 +28,11 @@ variables: 
  # workaround for job failures due to forge being slow to respond when uploading artifacts

  GIT_HTTP_LOW_SPEED_LIMIT: "0"

  GIT_HTTP_LOW_SPEED_TIME: "60"

  # set to DEBUG for more expressive logs

  IVAS_CI_PYTHON_LOG_LEVEL: "INFO"

  # default names for make build log files

  MAKE_BUILD_LOG_FILE_DEFAULT: "make-build-log"

  MAKE_BUILD_LOG_FILE_FLOAT_REF: "make-build-log-float-ref"

  MAKE_BUILD_LOG_FILE_FLOAT_REF_MERGE_SOURCE: "make-build-log-float-ref-merge-source"

  MAKE_BUILD_LOG_FILE_MERGE_TARGET: "make-build-log-merge-target"

  MAKE_BUILD_LOG_FILE_DUT: "make-build-log-dut"

main-basop.yml

+55 −39

File changed.

Preview size limit exceeded, changes collapsed.

main-float.yml

+62 −35

File changed.

Preview size limit exceeded, changes collapsed.

snippets/basop/build-binaries.sh

+5 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ float-ref) 
  ivas_rend_filename="./$REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  isar_post_rend_filename="./$REF_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  commit_file="$FLOAT_REF_COMMIT_FILE"

  make_log_file="$MAKE_BUILD_LOG_FILE_FLOAT_REF"

  ;;

float-ref-merge-source)

  ref_to_check_out="$MERGE_SOURCE_FLOAT_REF_COMMIT"
@@ -22,6 +23,7 @@ float-ref-merge-source) 
  ivas_rend_filename="./$MERGE_SOURCE_FLOAT_REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  isar_post_rend_filename="./$MERGE_SOURCE_FLOAT_REF_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  commit_file="$MERGE_SOURCE_FLOAT_REF_COMMIT_FILE"

  make_log_file="$MAKE_BUILD_LOG_FILE_FLOAT_REF_MERGE_SOURCE"

  ;;

merge-target)

  ref_to_check_out="$MERGE_TARGET_COMMIT"
@@ -31,6 +33,7 @@ merge-target) 
  ivas_rend_filename="./$MERGE_TARGET_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  isar_post_rend_filename="./$MERGE_TARGET_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  commit_file="$MERGE_TARGET_COMMIT_FILE"

  make_log_file="$MAKE_BUILD_LOG_FILE_MERGE_TARGET"

  ;;

dut)

  ref_to_check_out="$CI_COMMIT_SHA"
@@ -40,6 +43,7 @@ dut) 
  ivas_rend_filename="./$DUT_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  isar_post_rend_filename="./$DUT_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  commit_file="$CUT_COMMIT_FILE"

  make_log_file="$MAKE_BUILD_LOG_FILE_DUT"

  ;;

*)

  echo "Error: invalid mode: $mode"
@@ -73,7 +77,7 @@ git checkout "$ref_to_check_out" 
bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/activate-debug-mode-info-if-set.sh



make clean

make -j "$(nproc)"

make -j "$(nproc)" 2>&1 >$make_log_file



# avoid errors in mv when renaming to same file

mv IVAS_cod "${CI_PROJECT_DIR}/${ivas_cod_filename}"

snippets/copy-ltv-files-to-testv-dir.sh

+0 −2
Original line number Diff line number Diff line 
#! /bin/bash



set -euxo pipefail



cd "${CI_PROJECT_DIR}"



cp "$LTV_DIR"/*.wav scripts/testv/