Re: [PATCH RFC 1/3] gitlab: introduce explicit "container" and "build" stages

[Philippe Mathieu-Daudé]

On 6/25/20 10:54 AM, Thomas Huth wrote:
> On 22/06/2020 17.33, Daniel P. Berrangé wrote:
>> If no stage is listed, jobs get put in an implicit "test" stage.
>> Some jobs which create container images to be used by later stages
>> are currently listed as in a "build" stages.
>>
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>> ---
>>   .gitlab-ci.d/edk2.yml    |  3 ++-
>>   .gitlab-ci.d/opensbi.yml |  3 ++-
>>   .gitlab-ci.yml           | 11 +++++++++++
>>   3 files changed, 15 insertions(+), 2 deletions(-)
>>
>> diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml
>> index 088ba4b43a..d4e7dfcba6 100644
>> --- a/.gitlab-ci.d/edk2.yml
>> +++ b/.gitlab-ci.d/edk2.yml
>> @@ -1,5 +1,5 @@
>>   docker-edk2:
>> - stage: build
>> + stage: containers
>>    rules: # Only run this job when the Dockerfile is modified
>>    - changes:
>>      - .gitlab-ci-edk2.yml
> 
> Uh, oh, I guess I should have changed that line to .gitlab-ci.d/edk2.yml
> when I renamed that file .... will send a patch...

Well, your patch has been reviewed...

> 
>> @@ -24,6 +24,7 @@ docker-edk2:
>>    - docker push $IMAGE_TAG
>>     build-edk2:
>> + stage: build
>>    rules: # Only run this job when ...
>>    - changes: # ... roms/edk2/ is modified (submodule updated)
>>      - roms/edk2/*
>> diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
>> index dd051c0124..ec1c1f4cab 100644
>> --- a/.gitlab-ci.d/opensbi.yml
>> +++ b/.gitlab-ci.d/opensbi.yml
>> @@ -1,5 +1,5 @@
>>   docker-opensbi:
>> - stage: build
>> + stage: containers
>>    rules: # Only run this job when the Dockerfile is modified
>>    - changes:
>>      - .gitlab-ci-opensbi.yml
> 
> dito

Oops...

> 
>> @@ -24,6 +24,7 @@ docker-opensbi:
>>    - docker push $IMAGE_TAG
>>     build-opensbi:
>> + stage: build
>>    rules: # Only run this job when ...
>>    - changes: # ... roms/opensbi/ is modified (submodule updated)
>>      - roms/opensbi/*
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>> index 349c77aa58..9fdc752ea6 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -1,3 +1,7 @@
>> +stages:
>> +  - containers
>> +  - build
>> +
>>   include:
>>     - local: '/.gitlab-ci.d/edk2.yml'
>>     - local: '/.gitlab-ci.d/opensbi.yml'
>> @@ -17,6 +21,7 @@ include:
>>     - JOBS=$(expr $(nproc) + 1)
>>     build-system1:
>> + stage: build
>>    image: ubuntu:19.10
>>    <<: *before_script_apt
>>    script:
>> @@ -31,6 +36,7 @@ build-system1:
>>    - make -j"$JOBS" check
>>     build-system2:
>> + stage: build
>>    image: fedora:latest
>>    <<: *before_script_dnf
>>    script:
>> @@ -46,6 +52,7 @@ build-system2:
>>    - make -j"$JOBS" check
>>     build-disabled:
>> + stage: build
>>    image: fedora:latest
>>    <<: *before_script_dnf
>>    script:
>> @@ -62,6 +69,7 @@ build-disabled:
>>    - make -j"$JOBS" check-qtest SPEED=slow
>>     build-tcg-disabled:
>> + stage: build
>>    image: centos:8
>>    <<: *before_script_dnf
>>    script:
>> @@ -82,6 +90,7 @@ build-tcg-disabled:
>>               260 261 262 263 264 270 272 273 277 279
>>     build-user:
>> + stage: build
>>    <<: *before_script_apt
>>    script:
>>    - mkdir build
>> @@ -92,6 +101,7 @@ build-user:
>>    - make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user
>>     build-clang:
>> + stage: build
>>    image: fedora:latest
>>    <<: *before_script_dnf
>>    script:
>> @@ -106,6 +116,7 @@ build-clang:
>>    - make -j"$JOBS" check
>>     build-tci:
>> + stage: build
>>    image: centos:8
>>    <<: *before_script_dnf
>>    script:
>>
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>