From 37421c3f929ff4cfb659f715d10977006975686e Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Sat, 13 Apr 2024 10:45:35 +0200 Subject: [PATCH] BuildUnitTests: need to use ran-base:ci-temp if changes in ran-base Use correct baseTag for Unit Tests build in execution: - if build_helper or othe files changed, which would trigger rebuild of ran-base, use the corresponding ci-temp tag - use that tag consistently afterwards --- ci-scripts/cls_containerize.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 7b2813325f..75a421495e 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -668,7 +668,7 @@ class Containerize(): cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX') result = re.search('index', cmd.getBefore()) if result is not None: - baseTag = 'develop' + baseTag = 'ci-temp' ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}") if ret.returncode != 0: logging.error(f'No {baseImage} image present, cannot build tests') @@ -688,8 +688,8 @@ class Containerize(): HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile]) # it worked, build and execute tests, and close connection - ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:develop ctest --output-on-failure --no-label-summary -j$(nproc)') - cmd.run(f'docker rmi ran-unittests:develop') + ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)') + cmd.run(f'docker rmi ran-unittests:{baseTag}') build_log_name = f'build_log_{self.testCase_id}' CopyLogsToExecutor(cmd, lSourcePath, build_log_name) cmd.close()