Even with the recent split moving beefier plugins into contrib and
dropping them from the check-tcg tests we are still hitting time
limits. This possibly points to a slow down of --debug-tcg but seeing
as we are migrating stuff to gitlab we might as well move there and
bump the timeout.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
v2
  - use timeout instead of split build
---
 .gitlab-ci.yml | 11 +++++++++++
 .travis.yml    | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c265e7f8ab..346f23acf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,6 +244,17 @@ build-user:
     CONFIGURE_ARGS: --disable-tools --disable-system
     MAKE_CHECK_ARGS: check-tcg
 
+# Run check-tcg against linux-user (with plugins)
+# we skip sparc64-linux-user until it has been fixed somewhat
+# we skip cris-linux-user as it doesn't use the common run loop
+build-user-plugins:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: debian-all-test-cross
+    CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user
+    MAKE_CHECK_ARGS: check-tcg
+  timeout: 1h 30m
+
 build-clang:
   <<: *native_build_job_definition
   variables:
diff --git a/.travis.yml b/.travis.yml
index c255c331a7..519e62432d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -311,17 +311,6 @@ jobs:
         - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
 
 
-    # Run check-tcg against linux-user (with plugins)
-    # we skip sparc64-linux-user until it has been fixed somewhat
-    # we skip cris-linux-user as it doesn't use the common run loop
-    - name: "GCC plugins check-tcg (user)"
-      env:
-        - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user"
-        - TEST_BUILD_CMD="make build-tcg"
-        - TEST_CMD="make check-tcg"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
-
-
     # Run check-tcg against softmmu targets
     - name: "GCC check-tcg (some-softmmu)"
       env:
-- 
2.20.1

On Fri, 2020-10-02 at 11:32 +0100, Alex Bennée wrote:
> Even with the recent split moving beefier plugins into contrib and
> dropping them from the check-tcg tests we are still hitting time
> limits. This possibly points to a slow down of --debug-tcg but seeing
> as we are migrating stuff to gitlab we might as well move there and
> bump the timeout.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Hi Alex,

Unrelated to the patch: do we have custom runners on gitlab? I'm
exploring ideas to run vm based tests there.

Fam

On 02/10/2020 13.16, Fam Zheng wrote:
> On Fri, 2020-10-02 at 11:32 +0100, Alex Bennée wrote:
>> Even with the recent split moving beefier plugins into contrib and
>> dropping them from the check-tcg tests we are still hitting time
>> limits. This possibly points to a slow down of --debug-tcg but seeing
>> as we are migrating stuff to gitlab we might as well move there and
>> bump the timeout.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> Hi Alex,
> 
> Unrelated to the patch: do we have custom runners on gitlab? I'm
> exploring ideas to run vm based tests there.

Not yet, but Cleber is working on that topic...

 Thomas

On 02/10/2020 12.32, Alex Bennée wrote:
> Even with the recent split moving beefier plugins into contrib and
> dropping them from the check-tcg tests we are still hitting time
> limits. This possibly points to a slow down of --debug-tcg but seeing
> as we are migrating stuff to gitlab we might as well move there and
> bump the timeout.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> ---
> v2
>   - use timeout instead of split build
> ---
>  .gitlab-ci.yml | 11 +++++++++++
>  .travis.yml    | 11 -----------
>  2 files changed, 11 insertions(+), 11 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>