From efea09eab31fe652b34264f25219ca739229f45b Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 18 Oct 2023 15:12:44 +0200 Subject: [PATCH 1/3] change jobs to run on to-be-tested runner --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe58926df2..834716cedb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,14 +202,14 @@ stages: # templates to define stages and platforms .test-job-linux: tags: - - ivas-linux + - test-fhg-runner3 .build-job-linux: stage: build timeout: "4 minutes" needs: [] tags: - - ivas-linux + - test-fhg-runner3 .build-job-windows: stage: build @@ -272,7 +272,7 @@ branch-is-up-to-date-with-main-pre: stage: prevalidate needs: [] tags: - - ivas-linux + - test-fhg-runner3 script: - *get-commits-behind-count - echo $commits_behind_count @@ -283,7 +283,7 @@ branch-is-up-to-date-with-main-post: - .rules-merge-request stage: postvalidate tags: - - ivas-linux + - test-fhg-runner3 script: - *get-commits-behind-count - echo $commits_behind_count @@ -973,8 +973,6 @@ check-first-frame-is-sid: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request - tags: - - ivas-linux stage: test needs: ["build-codec-linux-cmake"] script: -- GitLab From cea1381d9f47caecbd2d2eb67a2de7ca86c6f6bc Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 18 Oct 2023 15:14:58 +0200 Subject: [PATCH 2/3] correct runner tag --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 834716cedb..836506906a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,14 +202,14 @@ stages: # templates to define stages and platforms .test-job-linux: tags: - - test-fhg-runner3 + - test-fhg-linux-runner3 .build-job-linux: stage: build timeout: "4 minutes" needs: [] tags: - - test-fhg-runner3 + - test-fhg-linux-runner3 .build-job-windows: stage: build @@ -272,7 +272,7 @@ branch-is-up-to-date-with-main-pre: stage: prevalidate needs: [] tags: - - test-fhg-runner3 + - test-fhg-linux-runner3 script: - *get-commits-behind-count - echo $commits_behind_count @@ -283,7 +283,7 @@ branch-is-up-to-date-with-main-post: - .rules-merge-request stage: postvalidate tags: - - test-fhg-runner3 + - test-fhg-linux-runner3 script: - *get-commits-behind-count - echo $commits_behind_count -- GitLab From cd6e53427134dc66e2613a31a6af7deb8dbac9d8 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 18 Oct 2023 16:09:16 +0200 Subject: [PATCH 3/3] run sidstart test with one thread only to debug halting issue --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 836506906a..12bcf52798 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -990,11 +990,11 @@ check-first-frame-is-sid: # run all modes and cut bitstream to start with an SID. Use stereo output to limit runtime, test is only about decoding - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -vE "FOA|HOA" ) - - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 --oc stereo || exit_code_no_sba=$? + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 -t 1 --oc stereo || exit_code_no_sba=$? - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -E "HOA") - - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 --oc stereo || exit_code_hoa=$? + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 -t 1 --oc stereo || exit_code_hoa=$? - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep "FOA") - - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 --oc stereo || exit_code_foa=$? + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 -t 1 --oc stereo || exit_code_foa=$? - if [ $exit_code_no_sba -ne 0 ] || [ $exit_code_hoa -ne 0 ] || [ $exit_code_hoa -ne 0 ]; then exit 1; fi artifacts: -- GitLab