From 91f7f512dd12f3212dbbe966ab8d6eaa9108e333 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Mon, 25 Jul 2022 14:20:41 +0200
Subject: [PATCH 1/4] use new label for smoke test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82f826e6ff..f87c98d332 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,7 +120,7 @@ codec-smoke-test:
   extends: .test-job-linux-needs-testv-dir
   # temporarily restrict this job to the only runner which (so far) seems to runit without problems
   tags:
-    - test-fhg-linux-runner1
+    - smoke-test
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   stage: test
-- 
GitLab


From 0dcf61bf51e702a66922ff9896d50b674f61fc52 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Mon, 25 Jul 2022 15:02:37 +0200
Subject: [PATCH 2/4] add timeout for jobs

---
 .gitlab-ci.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f87c98d332..9c4bb23342 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,9 +31,17 @@ stages:
   tags:
     - ivas-linux
 
+.build-job-linux:
+  extends: .test-job
+  stage: build
+  timeout: "2 minutes"
+  tags:
+    - ivas-linux
+
+
 # template for test jobs on linux that need the TESTV_DIR
 .test-job-linux-needs-testv-dir:
-  extends: .test-job-linux
+  extends: .build-job-linux
   before_script:
     - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi
     - cp -r scripts/testv/* $TESTV_DIR/
@@ -87,7 +95,6 @@ build-codec-linux-cmake:
   extends: .build-job-with-check-for-warnings
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  stage: build
   script:
     - mkdir build
     - cd build
@@ -98,19 +105,17 @@ build-codec-linux-cmake:
     - ci/check_for_warnings.py $BUILD_OUTPUT || exit $?
 
 build-codec-instrumented-linux:
-  extends: .test-job-linux
+  extends: .build-job-linux
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  stage: build
   script:
     - bash ci/build_codec_instrumented_linux.sh
 
-# make sure that the codec builds with msan, asan and usan
+make sure that the codec builds with msan, asan and usan
 build-codec-sanitizers-linux:
-  extends: .test-job-linux
+  extends: .build-job-linux
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  stage: build
   script:
     - bash ci/build_codec_sanitizers_linux.sh
 
@@ -121,6 +126,7 @@ codec-smoke-test:
   # temporarily restrict this job to the only runner which (so far) seems to runit without problems
   tags:
     - smoke-test
+  timeout: "5 minutes"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   stage: test
@@ -142,6 +148,7 @@ self-test-on-merge-request:
   needs: [ "build-codec-linux-cmake", "codec-smoke-test" ]
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  timeout: "10 minutes"
   script:
     ### build test binaries, initial clean for paranoia reasons
     - make clean
-- 
GitLab


From f1602cc4347578e530c6ac4f67792e02ebd5f346 Mon Sep 17 00:00:00 2001
From: kiene <jan.kiene@iis.fraunhofer.de>
Date: Mon, 25 Jul 2022 13:05:25 +0000
Subject: [PATCH 3/4] fix wrong template usage

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c4bb23342..69aa219386 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,14 +41,14 @@ stages:
 
 # template for test jobs on linux that need the TESTV_DIR
 .test-job-linux-needs-testv-dir:
-  extends: .build-job-linux
+  extends: .test-job-linux
   before_script:
     - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi
     - cp -r scripts/testv/* $TESTV_DIR/
 
 # template for build jobs to include the check for warnings
 .build-job-with-check-for-warnings:
-  extends: .test-job-linux
+  extends: .build-job-linux
   stage: build
   allow_failure:
     exit_codes:
-- 
GitLab


From a6f5146855de67c758e016b15d191ef25ca7be4a Mon Sep 17 00:00:00 2001
From: kiene <jan.kiene@iis.fraunhofer.de>
Date: Mon, 25 Jul 2022 13:06:21 +0000
Subject: [PATCH 4/4] fix typo in comment

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69aa219386..7aff1b478a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,7 @@ build-codec-instrumented-linux:
   script:
     - bash ci/build_codec_instrumented_linux.sh
 
-make sure that the codec builds with msan, asan and usan
+# make sure that the codec builds with msan, asan and usan
 build-codec-sanitizers-linux:
   extends: .build-job-linux
   rules:
-- 
GitLab