From eab697051b7da7d516b06003712e0d9495a284d5 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 24 Jan 2024 17:23:32 +0100 Subject: [PATCH 01/11] put commands for instrumented build job directly in ci file --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2cb41925e..be967d3c0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -329,7 +329,11 @@ build-codec-instrumented-linux: script: - *print-common-info - *activate-Werror-linux - - bash ci/build_codec_instrumented_linux.sh + - cd scripts + - ./prepare_instrumentation.sh + - cd c-code_instrument + - make -j + # - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan build-codec-sanitizers-linux: -- GitLab From 1e5b29e0bb82bd91f235a6196d20b62499d7d892 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 24 Jan 2024 18:01:08 +0100 Subject: [PATCH 02/11] try without changing dir --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be967d3c0b..d223b84dc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -329,10 +329,8 @@ build-codec-instrumented-linux: script: - *print-common-info - *activate-Werror-linux - - cd scripts - - ./prepare_instrumentation.sh - - cd c-code_instrument - - make -j + - ./scripts/prepare_instrumentation.sh + - make -j -C scripts/c-code_instrument # - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan -- GitLab From c7585c0c8e3e3f842686b78372d6d3a844c7cd9c Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 24 Jan 2024 18:10:15 +0100 Subject: [PATCH 03/11] small cleanup --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d223b84dc4..06d2f4e299 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -331,7 +331,6 @@ build-codec-instrumented-linux: - *activate-Werror-linux - ./scripts/prepare_instrumentation.sh - make -j -C scripts/c-code_instrument - # - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan build-codec-sanitizers-linux: -- GitLab From 5b5b333a2a31a6574ffd1a9051ec3a64ce8f8b88 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:21:31 +0100 Subject: [PATCH 04/11] use exactly same script lines as in test MR that works --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06d2f4e299..7cae0114c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -325,12 +325,16 @@ build-codec-instrumented-linux: extends: - .build-job-linux - .rules-basis - timeout: "6 minutes" + timeout: "7 minutes" + # TODO: remove + tags: + - test-fhg-linux-runner2 script: - *print-common-info - *activate-Werror-linux - ./scripts/prepare_instrumentation.sh - make -j -C scripts/c-code_instrument + # - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan build-codec-sanitizers-linux: -- GitLab From d21518eb17ffc3ab239fbdf20df532d415562388 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:27:10 +0100 Subject: [PATCH 05/11] remove comment --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cae0114c4..02712a7f69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -334,7 +334,6 @@ build-codec-instrumented-linux: - *activate-Werror-linux - ./scripts/prepare_instrumentation.sh - make -j -C scripts/c-code_instrument - # - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan build-codec-sanitizers-linux: -- GitLab From 71f965a8c945cbdbb021a58c4ee38a5398553c2f Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:29:45 +0100 Subject: [PATCH 06/11] back to old timeout value --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02712a7f69..27e9a159ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -325,7 +325,7 @@ build-codec-instrumented-linux: extends: - .build-job-linux - .rules-basis - timeout: "7 minutes" + timeout: "6 minutes" # TODO: remove tags: - test-fhg-linux-runner2 -- GitLab From 3a884bb42e0bf9fcf07821b42cc369ddbd48501c Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:35:28 +0100 Subject: [PATCH 07/11] Revert "back to old timeout value" This reverts commit 71f965a8c945cbdbb021a58c4ee38a5398553c2f. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27e9a159ad..02712a7f69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -325,7 +325,7 @@ build-codec-instrumented-linux: extends: - .build-job-linux - .rules-basis - timeout: "6 minutes" + timeout: "7 minutes" # TODO: remove tags: - test-fhg-linux-runner2 -- GitLab From 0fc1f396b18598f90686130a0c11cf544b8cf5e4 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:37:50 +0100 Subject: [PATCH 08/11] try other runner --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02712a7f69..84157e171a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -328,7 +328,7 @@ build-codec-instrumented-linux: timeout: "7 minutes" # TODO: remove tags: - - test-fhg-linux-runner2 + - test-fhg-linux-runner1 script: - *print-common-info - *activate-Werror-linux -- GitLab From cf02cbc88d6298fee06bc9b745c8a78031f13e91 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:40:55 +0100 Subject: [PATCH 09/11] remove debugging changes --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84157e171a..f368547ec5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -326,9 +326,6 @@ build-codec-instrumented-linux: - .build-job-linux - .rules-basis timeout: "7 minutes" - # TODO: remove - tags: - - test-fhg-linux-runner1 script: - *print-common-info - *activate-Werror-linux -- GitLab From 707b70b8809d5c9ff05e3f22b7b9608175a3fcea Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 11:58:26 +0100 Subject: [PATCH 10/11] increase timeout in other faiing job as well --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f368547ec5..a2a01d3751 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -752,7 +752,7 @@ ivas-pytest-on-merge-request: - .rules-merge-request stage: compare needs: ["build-codec-linux-cmake", "codec-smoke-test"] - timeout: "10 minutes" + timeout: "11 minutes" script: - *print-common-info - *get-commits-behind-count -- GitLab From 1f69933deb7be525432d66d8fcef66e8310ffc07 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 12:18:54 +0100 Subject: [PATCH 11/11] increase timeout even more --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2a01d3751..c306a2537b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -752,7 +752,7 @@ ivas-pytest-on-merge-request: - .rules-merge-request stage: compare needs: ["build-codec-linux-cmake", "codec-smoke-test"] - timeout: "11 minutes" + timeout: "14 minutes" script: - *print-common-info - *get-commits-behind-count -- GitLab