Commit 507b9afe authored by Jan Kiene's avatar Jan Kiene
Browse files

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

[CI] reduce clutter in console log of pytest-based CI jobs

See merge request !2548
parents 7f2361d1 56b51504

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
variables:

  # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this

  # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF reduce-console-log

  # If you need to set some config variable only in a local branch, then add an overwrite here

  # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR

  # this is more easily done directly here in the child repo

ci/setup_pages.py

+2 −3
Original line number Diff line number Diff line
@@ -182,11 +182,10 @@ def curl_for_artifacts(job_id: int, project_id: int, exdir: str): 
        "--output",

        ARTIFACTS,

    ]

    print(cmd)

    subprocess.run(cmd, check=True)



    # check for valid archive (if not, it is likely a 404 page, then display that)

    cmd = ["unzip", "-t", ARTIFACTS]

    cmd = ["unzip", "-t", "-qq", ARTIFACTS]

    try:

        subprocess.run(cmd, check=True)

    except subprocess.CalledProcessError:
@@ -195,7 +194,7 @@ def curl_for_artifacts(job_id: int, project_id: int, exdir: str): 
        raise subprocess.CalledProcessError(-1, "Unzip check failed")



    # do the actual unzipping

    cmd = ["unzip", ARTIFACTS, "-d", exdir]

    cmd = ["unzip", "-q", ARTIFACTS, "-d", exdir]

    subprocess.run(cmd, check=True)

pytest.ini

+1 −1
Original line number Diff line number Diff line 
# pytest.ini

# note: per convention, this file is placed in the root directory of the repository

[pytest]

addopts = --tb=short -n auto -v

addopts = --tb=short -n auto -ra

# Write captured system-out log messages to JUnit report.

junit_logging = system-out

# Do not capture log information for passing tests to JUnit report.

tests/create_short_testvectors.py

+4 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ Create short (5sec) testvectors. 
import argparse

import sys

import logging

import os

from pathlib import Path



from cut_pcm import cut_samples
@@ -112,7 +113,7 @@ def create_short_testvectors( 
        out_file = TEST_VECTOR_DIR.joinpath(f.stem + suffix + f.suffix)

        num_channels = audiofile.get_wav_file_info(f)["channels"]



        logging.info(f"{str(f)} -> {out_file}")

        logging.debug(f"{str(f)} -> {out_file}")



        if not dry:

            cut_samples(f, out_file, num_channels, CUT_FROM, f"{cut_len}", GAIN)
@@ -167,6 +168,8 @@ if __name__ == "__main__": 
    assert not (args.use_ltv and args.ltv_dir is None)



    logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")

    if os.environ.get("IVAS_CI_PYTHON_LOG_LEVEL") == "DEBUG":

        logging.basicConfig(level=logging.DEBUG, format="%(levelname)s: %(message)s")



    sys.exit(

        create_short_testvectors(