diff mbox series

[v3,11/11] gitlab-ci: Move artifacts expiry rule to common 'native_build_job'

Message ID 20201108221925.2344515-12-philmd@redhat.com
State Superseded
Headers show
Series [v3,01/11] gitlab-ci: Drop generic cache rule | expand

Commit Message

Philippe Mathieu-Daudé Nov. 8, 2020, 10:19 p.m. UTC
Build jobs include the 'native_build_job' template. Move
the 'artifacts expiry' rule there. Now all build jobs benefit
from it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 .gitlab-ci.yml | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

Comments

Thomas Huth Nov. 9, 2020, 9:59 a.m. UTC | #1
On 08/11/2020 23.19, Philippe Mathieu-Daudé wrote:
> Build jobs include the 'native_build_job' template. Move
> the 'artifacts expiry' rule there. Now all build jobs benefit
> from it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  .gitlab-ci.yml | 24 ++++--------------------
>  1 file changed, 4 insertions(+), 20 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index dd5f9a4c505..27a4cbc5171 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -79,6 +79,10 @@ include:
>        then
>          make -j"$JOBS" $MAKE_CHECK_ARGS ;
>        fi
> +  artifacts:
> +    expire_in: 2 days
> +    paths:
> +      - build

Should we also keep artifacts for pipelines that do not need it to pass them
from one job to the next? ... not sure ... considering that gitlab is
thinking about cutting down CI minutes etc., we should maybe be more
conservative and only keep artifacts where they are really needed?

 Thomas
Philippe Mathieu-Daudé Nov. 16, 2020, 1:01 p.m. UTC | #2
On 11/9/20 10:59 AM, Thomas Huth wrote:
> On 08/11/2020 23.19, Philippe Mathieu-Daudé wrote:

>> Build jobs include the 'native_build_job' template. Move

>> the 'artifacts expiry' rule there. Now all build jobs benefit

>> from it.

>>

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

>> ---

>>  .gitlab-ci.yml | 24 ++++--------------------

>>  1 file changed, 4 insertions(+), 20 deletions(-)

>>

>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml

>> index dd5f9a4c505..27a4cbc5171 100644

>> --- a/.gitlab-ci.yml

>> +++ b/.gitlab-ci.yml

>> @@ -79,6 +79,10 @@ include:

>>        then

>>          make -j"$JOBS" $MAKE_CHECK_ARGS ;

>>        fi

>> +  artifacts:

>> +    expire_in: 2 days

>> +    paths:

>> +      - build

> 

> Should we also keep artifacts for pipelines that do not need it to pass them

> from one job to the next? ... not sure ... considering that gitlab is

> thinking about cutting down CI minutes etc., we should maybe be more

> conservative and only keep artifacts where they are really needed?


As nothing is released from these jobs (except some roms/ and
documentation?) I'd not keep anything at this point. Later we
can be stricter and select the minimum we need.

(I don't think nobody ever downloaded a job artifact to test /
debug it).

> 

>  Thomas

>
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd5f9a4c505..27a4cbc5171 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,6 +79,10 @@  include:
       then
         make -j"$JOBS" $MAKE_CHECK_ARGS ;
       fi
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - build
 
 .native_test_job:
   extends: .native_common_job
@@ -121,10 +125,6 @@  build-system-ubuntu:
     TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu
       moxie-softmmu microblazeel-softmmu mips64el-softmmu
     MAKE_CHECK_ARGS: check-build
-  artifacts:
-    expire_in: 2 days
-    paths:
-      - build
 
 check-system-ubuntu:
   extends: .native_test_job
@@ -151,10 +151,6 @@  build-system-debian:
     TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu
       riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu
     MAKE_CHECK_ARGS: check-build
-  artifacts:
-    expire_in: 2 days
-    paths:
-      - build
 
 check-system-debian:
   extends: .native_test_job
@@ -182,10 +178,6 @@  build-system-fedora:
     TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu
       xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
     MAKE_CHECK_ARGS: check-build
-  artifacts:
-    expire_in: 2 days
-    paths:
-      - build
 
 check-system-fedora:
   extends: .native_test_job
@@ -213,10 +205,6 @@  build-system-centos:
     TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
       x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu
     MAKE_CHECK_ARGS: check-build
-  artifacts:
-    expire_in: 2 days
-    paths:
-      - build
 
 check-system-centos:
   extends: .native_test_job
@@ -317,10 +305,6 @@  build-deprecated:
     MAKE_CHECK_ARGS: build-tcg
     TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
       unicore32-softmmu
-  artifacts:
-    expire_in: 2 days
-    paths:
-      - build
 
 # We split the check-tcg step as test failures are expected but we still
 # want to catch the build breaking.