1. Patchew
  2. QEMU
  3. [PULL 00/31] various fixes (testing, plugins, gitdm)
  4. View patch

[PULL 05/31] gitlab: update centos-8-stream job

Alex Bennée posted 31 patches 2 years, 9 months ago
Only 11 patches received!
There is a newer version of this series
[PULL 05/31] gitlab: update centos-8-stream job
Posted by Alex Bennée 2 years, 9 months ago 
A couple of clean-ups here:

  - inherit from the custom runners job for artefacts
  - call check-avocado directly
  - add some comments to the top about setup

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230315174331.2959-6-alex.bennee@linaro.org>

diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
index 068b0c4335..367424db78 100644
--- a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
+++ b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
@@ -1,4 +1,9 @@
+# All centos-stream-8 jobs should run successfully in an environment
+# setup by the scripts/ci/setup/stream/8/build-environment.yml task
+# "Installation of extra packages to build QEMU"
+
 centos-stream-8-x86_64:
+ extends: .custom_runner_template
  allow_failure: true
  needs: []
  stage: build
@@ -8,15 +13,6 @@ centos-stream-8-x86_64:
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
  - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE"
- artifacts:
-   name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
-   when: on_failure
-   expire_in: 7 days
-   paths:
-     - build/tests/results/latest/results.xml
-     - build/tests/results/latest/test-results
-   reports:
-     junit: build/tests/results/latest/results.xml
  before_script:
  - JOBS=$(expr $(nproc) + 1)
  script:
@@ -25,6 +21,4 @@ centos-stream-8-x86_64:
  - ../scripts/ci/org.centos/stream/8/x86_64/configure
    || { cat config.log meson-logs/meson-log.txt; exit 1; }
  - make -j"$JOBS"
- - make NINJA=":" check
-   || { cat meson-logs/testlog.txt; exit 1; } ;
- - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado
+ - make NINJA=":" check check-avocado
-- 
2.39.2
Re: [PULL 05/31] gitlab: update centos-8-stream job
Posted by Philippe Mathieu-Daudé 2 years, 9 months ago 
On 18/3/23 12:46, Alex Bennée wrote:
> A couple of clean-ups here:
> 
>    - inherit from the custom runners job for artefacts

"artifacts"

>    - call check-avocado directly
>    - add some comments to the top about setup
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Message-Id: <20230315174331.2959-6-alex.bennee@linaro.org>
> 
> diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
> index 068b0c4335..367424db78 100644
> --- a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
> +++ b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
> @@ -1,4 +1,9 @@
> +# All centos-stream-8 jobs should run successfully in an environment
> +# setup by the scripts/ci/setup/stream/8/build-environment.yml task
> +# "Installation of extra packages to build QEMU"
> +
>   centos-stream-8-x86_64:
> + extends: .custom_runner_template
>    allow_failure: true
>    needs: []
>    stage: build
> @@ -8,15 +13,6 @@ centos-stream-8-x86_64:
>    rules:
>    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
>    - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE"
> - artifacts:
> -   name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
> -   when: on_failure
> -   expire_in: 7 days
> -   paths:
> -     - build/tests/results/latest/results.xml
> -     - build/tests/results/latest/test-results
> -   reports:
> -     junit: build/tests/results/latest/results.xml
>    before_script:
>    - JOBS=$(expr $(nproc) + 1)
>    script:
> @@ -25,6 +21,4 @@ centos-stream-8-x86_64:
>    - ../scripts/ci/org.centos/stream/8/x86_64/configure
>      || { cat config.log meson-logs/meson-log.txt; exit 1; }
>    - make -j"$JOBS"
> - - make NINJA=":" check
> -   || { cat meson-logs/testlog.txt; exit 1; } ;
> - - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado
> + - make NINJA=":" check check-avocado

Missing removing scripts/ci/org.centos/stream/8/x86_64/test-avocado
along with this patch.
Re: [PULL 05/31] gitlab: update centos-8-stream job
Posted by Alex Bennée 2 years, 9 months ago 
Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> On 18/3/23 12:46, Alex Bennée wrote:
>> A couple of clean-ups here:
>>    - inherit from the custom runners job for artefacts
>
> "artifacts"
>
>>    - call check-avocado directly
>>    - add some comments to the top about setup
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>> Message-Id: <20230315174331.2959-6-alex.bennee@linaro.org>
>> diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
>> b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
>> index 068b0c4335..367424db78 100644
>> --- a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
>> +++ b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
>> @@ -1,4 +1,9 @@
>> +# All centos-stream-8 jobs should run successfully in an environment
>> +# setup by the scripts/ci/setup/stream/8/build-environment.yml task
>> +# "Installation of extra packages to build QEMU"
>> +
>>   centos-stream-8-x86_64:
>> + extends: .custom_runner_template
>>    allow_failure: true
>>    needs: []
>>    stage: build
>> @@ -8,15 +13,6 @@ centos-stream-8-x86_64:
>>    rules:
>>    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
>>    - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE"
>> - artifacts:
>> -   name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
>> -   when: on_failure
>> -   expire_in: 7 days
>> -   paths:
>> -     - build/tests/results/latest/results.xml
>> -     - build/tests/results/latest/test-results
>> -   reports:
>> -     junit: build/tests/results/latest/results.xml
>>    before_script:
>>    - JOBS=$(expr $(nproc) + 1)
>>    script:
>> @@ -25,6 +21,4 @@ centos-stream-8-x86_64:
>>    - ../scripts/ci/org.centos/stream/8/x86_64/configure
>>      || { cat config.log meson-logs/meson-log.txt; exit 1; }
>>    - make -j"$JOBS"
>> - - make NINJA=":" check
>> -   || { cat meson-logs/testlog.txt; exit 1; } ;
>> - - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado
>> + - make NINJA=":" check check-avocado
>
> Missing removing scripts/ci/org.centos/stream/8/x86_64/test-avocado
> along with this patch.

Given the failure running check-avocado maybe I should drop this part of
the change. I was aiming for increasing coverage but perhaps we should
stick with the limited cross section of tests?

Anyway I'm re-building my Centos8 Stream box now with more disk space to
see if I can see whats going wrong.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.