Re: [PATCH v1 31/33] gitlab: convert build/container jobs to .base_job_template

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> On 27/05/2022 17.36, Alex Bennée wrote:
>> From: Daniel P. Berrangé <berrange@redhat.com>
>> This converts the main build and container jobs to use the
>> base job rules, defining the following new variables
>>   - QEMU_JOB_SKIPPED - jobs that are known to be currently
>>     broken and should not be run. Can still be manually
>>     launched if desired.
>>   - QEMU_JOB_AVOCADO - jobs that run the Avocado integration
>>     test harness.
>>   - QEMU_JOB_PUBLISH - jobs that publish content after the
>>     branch is merged upstream
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>> Message-Id: <20220526110705.59952-5-berrange@redhat.com>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
> ...
>> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
>> index e9620c3074..ecac3ec50c 100644
>> --- a/.gitlab-ci.d/buildtest.yml
>> +++ b/.gitlab-ci.d/buildtest.yml
>> @@ -360,12 +360,11 @@ build-cfi-aarch64:
>>       expire_in: 2 days
>>       paths:
>>         - build
>> -  rules:
>> +  variables:
>>       # FIXME: This job is often failing, likely due to out-of-memory 
>> problems in
>>       # the constrained containers of the shared runners. Thus this is 
>> marked as
>> -    # manual until the situation has been solved.
>> -    - when: manual
>> -      allow_failure: true
>> +    # skipped until the situation has been solved.
>> +    QEMU_JOB_SKIPPED: 1
>>     check-cfi-aarch64:
>>     extends: .native_test_job_template
>> @@ -402,12 +401,11 @@ build-cfi-ppc64-s390x:
>>       expire_in: 2 days
>>       paths:
>>         - build
>> -  rules:
>> +  variables:
>>       # FIXME: This job is often failing, likely due to out-of-memory 
>> problems in
>>       # the constrained containers of the shared runners. Thus this is 
>> marked as
>> -    # manual until the situation has been solved.
>> -    - when: manual
>> -      allow_failure: true
>> +    # skipped until the situation has been solved.
>> +    QEMU_JOB_SKIPPED: 1
>>     check-cfi-ppc64-s390x:
>>     extends: .native_test_job_template
>> @@ -579,6 +577,7 @@ build-without-default-features:
>>       MAKE_CHECK_ARGS: check-unit check-qtest SPEED=slow
>>     build-libvhost-user:
>> +  extends: .base_job_template
>>     stage: build
>>     image: $CI_REGISTRY_IMAGE/qemu/fedora:latest
>>     needs:
>> @@ -595,10 +594,13 @@ build-tools-and-docs-debian:
>>     extends: .native_build_job_template
>>     needs:
>>       job: amd64-debian-container
>> +    # when running on 'master' we use pre-existing container
>> +    optional: true
>
> This change doesn't look like it's related to the other changes in
> here? Maybe mention it in the patch description at least?

It is because the QEMU_JOB_PUBLISH stage is run on master so we don't
really need to rebuild the container from staging to run it. I've
mentioned it in the commit.

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


-- 
Alex Bennée