From c30762d27d0b00349371af11e51c2af186a0a411 Mon Sep 17 00:00:00 2001 From: lhchavez Date: Tue, 24 Jan 2023 07:42:12 -0800 Subject: [PATCH] bump --- container.py | 3 ++- runtests.py | 13 +++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/container.py b/container.py index 9a97690..e655923 100644 --- a/container.py +++ b/container.py @@ -38,7 +38,8 @@ def getImageName(ci: bool) -> str: # This does not require authentication. imageName = 'omegaup/runner-ci' - taggedContainerName = f'{imageName}:v1.9.55' + taggedContainerName = f'{imageName}:v1.9.59' + taggedContainerName = 'omegaup/runner-ci:latest' if not subprocess.check_output( ['docker', 'image', 'ls', '-q', taggedContainerName], universal_newlines=True).strip(): diff --git a/runtests.py b/runtests.py index 238085e..10057a2 100755 --- a/runtests.py +++ b/runtests.py @@ -75,14 +75,22 @@ def _testProblem(p: problems.Problem, *, threadAffinityMapping: Dict[int, int], if len(threadAffinityMapping) == 1: # No need to involve taskset. Just run the container normally. tasksetArgs = [ + #'--entrypoint', 'strace', container.getImageName(ci), + #'-f', + #'-o/tmp/strace.txt', + #'--', + #'/usr/bin/omegaup-runner', ] else: # Mark the entrypoint as only being able to run in a single core. tasksetArgs = [ - '--entrypoint', - '/usr/bin/taskset', + '--entrypoint', 'strace', container.getImageName(ci), + '-f', + '-o/tmp/strace.txt', + '--', + '/usr/bin/taskset', f'0x{2**threadAffinityMapping[threading.get_ident()]:x}', '/usr/bin/omegaup-runner', ] @@ -90,6 +98,7 @@ def _testProblem(p: problems.Problem, *, threadAffinityMapping: Dict[int, int], args = [ 'docker', 'run', + '--name=ci', '--rm', '--volume', f'{rootDirectory}:/src',