[4.19.y-cip-rt] Update CI to use the latest linux-cip-ci containers
diff mbox series

Message ID 20190731220244.20321-1-chris.paterson2@renesas.com
State Accepted
Delegated to: Nobuhiro Iwamatsu
Headers show
Series
  • [4.19.y-cip-rt] Update CI to use the latest linux-cip-ci containers
Related show

Commit Message

Chris Paterson July 31, 2019, 10:02 p.m. UTC
The main aim of this update is to add support for more build
architectures.

In addition, we need to include a fix so that builds using Kernel
configs from cip-kernel-config will work again, after changes to the
directory structure caused us problems.

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Comments

Ben Hutchings Aug. 1, 2019, 6:32 p.m. UTC | #1
On Wed, 2019-07-31 at 23:02 +0100, Chris Paterson wrote:
> The main aim of this update is to add support for more build
> architectures.
> 
> In addition, we need to include a fix so that builds using Kernel
> configs from cip-kernel-config will work again, after changes to the
> directory structure caused us problems.

Sorry about the lack of notice for that.

I started out working alone on the kernel-config and kernel-sec
repositories, so didn't have anyone to review the changes, so I got in
the habit of simply pushing my changes.

Since that's no longer the case I will try to stick to merge requests
that can be reviewed before I make breaking changes.  (That doesn't
mean there won't be any breaking changes in future, but it's more
likely that there will be advance warning.)

Ben.

> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
> ---
>  .gitlab-ci.yml | 22 ++++++++++++----------
>  1 file changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 96eed0e0c81a..fb775f4950b1 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -2,16 +2,17 @@ variables:
>    GIT_STRATEGY: clone
>    GIT_DEPTH: 10
>    DOCKER_DRIVER: overlay2
> +  DOCKER_IMAGE_TAG: v2
>  
> -build_arm_renesas_shmobile_defconfig:
> +arm_renesas_shmobile_defconfig:
>    stage: build
> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> +  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_TAG
>    variables:
>      BUILD_ARCH: arm
>      CONFIG: renesas_shmobile_defconfig
>      CONFIG_LOC: cip-kernel-config
>      DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
> -    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
> +    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb
>    script:
>      - /opt/build_kernel.sh
>    artifacts:
> @@ -20,15 +21,15 @@ build_arm_renesas_shmobile_defconfig:
>      paths:
>        - output
>  
> -build_arm64_renesas_defconfig:
> +arm64_renesas_defconfig:
>    stage: build
> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> +  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_TAG
>    variables:
>      BUILD_ARCH: arm64
>      CONFIG: renesas_defconfig
>      CONFIG_LOC: cip-kernel-config
>      DEVICES: r8a774c0-ek874
> -    DTBS: arch/arm64/boot/dts/renesas/r8a774c0-ek874.dtb
> +    DTBS: r8a774c0-ek874.dtb
>    script:
>      - /opt/build_kernel.sh
>    artifacts:
> @@ -37,15 +38,15 @@ build_arm64_renesas_defconfig:
>      paths:
>        - output
>  
> -build_arm_shmobile_defconfig:
> +arm_shmobile_defconfig:
>    stage: build
> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> +  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_TAG
>    variables:
>      BUILD_ARCH: arm
>      CONFIG: shmobile_defconfig
>      CONFIG_LOC: intree
>      DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
> -    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
> +    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb
>    script:
>      - /opt/build_kernel.sh
>    artifacts:
> @@ -56,10 +57,11 @@ build_arm_shmobile_defconfig:
>  
>  run_tests:
>    stage: test
> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:test-v1
> +  image: registry.gitlab.com/cip-playground/linux-cip-ci:test-$DOCKER_IMAGE_TAG
>    when: always
>    variables:
>      GIT_STRATEGY: none
> +    TEST_TIMEOUT: 30
>    script:
>      - /opt/submit_tests.sh
>    artifacts:
Nobuhiro Iwamatsu Aug. 1, 2019, 11:30 p.m. UTC | #2
Hi Chris,

> -----Original Message-----
> From: cip-dev-bounces@lists.cip-project.org
> [mailto:cip-dev-bounces@lists.cip-project.org] On Behalf Of Chris
> Paterson
> Sent: Thursday, August 1, 2019 7:03 AM
> To: cip-dev@lists.cip-project.org
> Subject: [cip-dev] [PATCH 4.19.y-cip-rt] Update CI to use the latest
> linux-cip-ci containers
> 
> The main aim of this update is to add support for more build architectures.
> 
> In addition, we need to include a fix so that builds using Kernel configs
> from cip-kernel-config will work again, after changes to the directory
> structure caused us problems.
> 
> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>


Applied, thanks.

Best regards,
  Nobuhiro


> ---
>  .gitlab-ci.yml | 22 ++++++++++++----------
>  1 file changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index
> 96eed0e0c81a..fb775f4950b1 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -2,16 +2,17 @@ variables:
>    GIT_STRATEGY: clone
>    GIT_DEPTH: 10
>    DOCKER_DRIVER: overlay2
> +  DOCKER_IMAGE_TAG: v2
> 
> -build_arm_renesas_shmobile_defconfig:
> +arm_renesas_shmobile_defconfig:
>    stage: build
> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> +  image:
> +
> registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_
> TA
> + G
>    variables:
>      BUILD_ARCH: arm
>      CONFIG: renesas_shmobile_defconfig
>      CONFIG_LOC: cip-kernel-config
>      DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
> -    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb
> arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
> +    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb
> + r8a7745-iwg22d-sodimm-dbhd-ca.dtb
>    script:
>      - /opt/build_kernel.sh
>    artifacts:
> @@ -20,15 +21,15 @@ build_arm_renesas_shmobile_defconfig:
>      paths:
>        - output
> 
> -build_arm64_renesas_defconfig:
> +arm64_renesas_defconfig:
>    stage: build
> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> +  image:
> +
> registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_
> TA
> + G
>    variables:
>      BUILD_ARCH: arm64
>      CONFIG: renesas_defconfig
>      CONFIG_LOC: cip-kernel-config
>      DEVICES: r8a774c0-ek874
> -    DTBS: arch/arm64/boot/dts/renesas/r8a774c0-ek874.dtb
> +    DTBS: r8a774c0-ek874.dtb
>    script:
>      - /opt/build_kernel.sh
>    artifacts:
> @@ -37,15 +38,15 @@ build_arm64_renesas_defconfig:
>      paths:
>        - output
> 
> -build_arm_shmobile_defconfig:
> +arm_shmobile_defconfig:
>    stage: build
> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> +  image:
> +
> registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_
> TA
> + G
>    variables:
>      BUILD_ARCH: arm
>      CONFIG: shmobile_defconfig
>      CONFIG_LOC: intree
>      DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
> -    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb
> arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
> +    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb
> + r8a7745-iwg22d-sodimm-dbhd-ca.dtb
>    script:
>      - /opt/build_kernel.sh
>    artifacts:
> @@ -56,10 +57,11 @@ build_arm_shmobile_defconfig:
> 
>  run_tests:
>    stage: test
> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:test-v1
> +  image:
> +
> registry.gitlab.com/cip-playground/linux-cip-ci:test-$DOCKER_IMAGE_T
> AG
>    when: always
>    variables:
>      GIT_STRATEGY: none
> +    TEST_TIMEOUT: 30
>    script:
>      - /opt/submit_tests.sh
>    artifacts:
> --
> 2.17.1
> 
> _______________________________________________
> cip-dev mailing list
> cip-dev@lists.cip-project.org
> https://lists.cip-project.org/mailman/listinfo/cip-dev
Chris Paterson Aug. 2, 2019, 7:22 a.m. UTC | #3
> From: Ben Hutchings <ben.hutchings@codethink.co.uk>
> Sent: 01 August 2019 19:32
> 
> On Wed, 2019-07-31 at 23:02 +0100, Chris Paterson wrote:
> > The main aim of this update is to add support for more build
> > architectures.
> >
> > In addition, we need to include a fix so that builds using Kernel
> > configs from cip-kernel-config will work again, after changes to the
> > directory structure caused us problems.
> 
> Sorry about the lack of notice for that.

No worries. These things happen.

> 
> I started out working alone on the kernel-config and kernel-sec
> repositories, so didn't have anyone to review the changes, so I got in
> the habit of simply pushing my changes.
> 
> Since that's no longer the case I will try to stick to merge requests
> that can be reviewed before I make breaking changes.  (That doesn't
> mean there won't be any breaking changes in future, but it's more
> likely that there will be advance warning.)

I think that's the best we can hope for. I'll keep an eye out.

Thanks, Chris

> 
> Ben.
> 
> > Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
> > ---
> >  .gitlab-ci.yml | 22 ++++++++++++----------
> >  1 file changed, 12 insertions(+), 10 deletions(-)
> >
> > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> > index 96eed0e0c81a..fb775f4950b1 100644
> > --- a/.gitlab-ci.yml
> > +++ b/.gitlab-ci.yml
> > @@ -2,16 +2,17 @@ variables:
> >    GIT_STRATEGY: clone
> >    GIT_DEPTH: 10
> >    DOCKER_DRIVER: overlay2
> > +  DOCKER_IMAGE_TAG: v2
> >
> > -build_arm_renesas_shmobile_defconfig:
> > +arm_renesas_shmobile_defconfig:
> >    stage: build
> > -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> > +  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-
> $DOCKER_IMAGE_TAG
> >    variables:
> >      BUILD_ARCH: arm
> >      CONFIG: renesas_shmobile_defconfig
> >      CONFIG_LOC: cip-kernel-config
> >      DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
> > -    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb
> arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
> > +    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-
> ca.dtb
> >    script:
> >      - /opt/build_kernel.sh
> >    artifacts:
> > @@ -20,15 +21,15 @@ build_arm_renesas_shmobile_defconfig:
> >      paths:
> >        - output
> >
> > -build_arm64_renesas_defconfig:
> > +arm64_renesas_defconfig:
> >    stage: build
> > -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> > +  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-
> $DOCKER_IMAGE_TAG
> >    variables:
> >      BUILD_ARCH: arm64
> >      CONFIG: renesas_defconfig
> >      CONFIG_LOC: cip-kernel-config
> >      DEVICES: r8a774c0-ek874
> > -    DTBS: arch/arm64/boot/dts/renesas/r8a774c0-ek874.dtb
> > +    DTBS: r8a774c0-ek874.dtb
> >    script:
> >      - /opt/build_kernel.sh
> >    artifacts:
> > @@ -37,15 +38,15 @@ build_arm64_renesas_defconfig:
> >      paths:
> >        - output
> >
> > -build_arm_shmobile_defconfig:
> > +arm_shmobile_defconfig:
> >    stage: build
> > -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
> > +  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-
> $DOCKER_IMAGE_TAG
> >    variables:
> >      BUILD_ARCH: arm
> >      CONFIG: shmobile_defconfig
> >      CONFIG_LOC: intree
> >      DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
> > -    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb
> arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
> > +    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-
> ca.dtb
> >    script:
> >      - /opt/build_kernel.sh
> >    artifacts:
> > @@ -56,10 +57,11 @@ build_arm_shmobile_defconfig:
> >
> >  run_tests:
> >    stage: test
> > -  image: registry.gitlab.com/cip-playground/linux-cip-ci:test-v1
> > +  image: registry.gitlab.com/cip-playground/linux-cip-ci:test-
> $DOCKER_IMAGE_TAG
> >    when: always
> >    variables:
> >      GIT_STRATEGY: none
> > +    TEST_TIMEOUT: 30
> >    script:
> >      - /opt/submit_tests.sh
> >    artifacts:
> --
> Ben Hutchings, Software Developer                         Codethink Ltd
> https://www.codethink.co.uk/                 Dale House, 35 Dale Street
>                                      Manchester, M1 2HF, United Kingdom
Jan Kiszka Aug. 2, 2019, 10:34 a.m. UTC | #4
On 02.08.19 01:30, nobuhiro1.iwamatsu@toshiba.co.jp wrote:
> Hi Chris,
> 
>> -----Original Message-----
>> From: cip-dev-bounces@lists.cip-project.org
>> [mailto:cip-dev-bounces@lists.cip-project.org] On Behalf Of Chris
>> Paterson
>> Sent: Thursday, August 1, 2019 7:03 AM
>> To: cip-dev@lists.cip-project.org
>> Subject: [cip-dev] [PATCH 4.19.y-cip-rt] Update CI to use the latest
>> linux-cip-ci containers
>>
>> The main aim of this update is to add support for more build architectures.
>>
>> In addition, we need to include a fix so that builds using Kernel configs
>> from cip-kernel-config will work again, after changes to the directory
>> structure caused us problems.
>>
>> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
> 
> 
> Applied, thanks.

My stomach says that maintaining details of our CI infrastructure inside our
kernel tree is not the optimal approach. We will end up with a constantly
increasing number of fairly specific, non-kernel commits this way.

But that's just my impressions.

Jan

> 
> Best regards,
>   Nobuhiro
> 
> 
>> ---
>>  .gitlab-ci.yml | 22 ++++++++++++----------
>>  1 file changed, 12 insertions(+), 10 deletions(-)
>>
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index
>> 96eed0e0c81a..fb775f4950b1 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -2,16 +2,17 @@ variables:
>>    GIT_STRATEGY: clone
>>    GIT_DEPTH: 10
>>    DOCKER_DRIVER: overlay2
>> +  DOCKER_IMAGE_TAG: v2
>>
>> -build_arm_renesas_shmobile_defconfig:
>> +arm_renesas_shmobile_defconfig:
>>    stage: build
>> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
>> +  image:
>> +
>> registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_
>> TA
>> + G
>>    variables:
>>      BUILD_ARCH: arm
>>      CONFIG: renesas_shmobile_defconfig
>>      CONFIG_LOC: cip-kernel-config
>>      DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
>> -    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb
>> arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
>> +    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb
>> + r8a7745-iwg22d-sodimm-dbhd-ca.dtb
>>    script:
>>      - /opt/build_kernel.sh
>>    artifacts:
>> @@ -20,15 +21,15 @@ build_arm_renesas_shmobile_defconfig:
>>      paths:
>>        - output
>>
>> -build_arm64_renesas_defconfig:
>> +arm64_renesas_defconfig:
>>    stage: build
>> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
>> +  image:
>> +
>> registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_
>> TA
>> + G
>>    variables:
>>      BUILD_ARCH: arm64
>>      CONFIG: renesas_defconfig
>>      CONFIG_LOC: cip-kernel-config
>>      DEVICES: r8a774c0-ek874
>> -    DTBS: arch/arm64/boot/dts/renesas/r8a774c0-ek874.dtb
>> +    DTBS: r8a774c0-ek874.dtb
>>    script:
>>      - /opt/build_kernel.sh
>>    artifacts:
>> @@ -37,15 +38,15 @@ build_arm64_renesas_defconfig:
>>      paths:
>>        - output
>>
>> -build_arm_shmobile_defconfig:
>> +arm_shmobile_defconfig:
>>    stage: build
>> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
>> +  image:
>> +
>> registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_
>> TA
>> + G
>>    variables:
>>      BUILD_ARCH: arm
>>      CONFIG: shmobile_defconfig
>>      CONFIG_LOC: intree
>>      DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
>> -    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb
>> arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
>> +    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb
>> + r8a7745-iwg22d-sodimm-dbhd-ca.dtb
>>    script:
>>      - /opt/build_kernel.sh
>>    artifacts:
>> @@ -56,10 +57,11 @@ build_arm_shmobile_defconfig:
>>
>>  run_tests:
>>    stage: test
>> -  image: registry.gitlab.com/cip-playground/linux-cip-ci:test-v1
>> +  image:
>> +
>> registry.gitlab.com/cip-playground/linux-cip-ci:test-$DOCKER_IMAGE_T
>> AG
>>    when: always
>>    variables:
>>      GIT_STRATEGY: none
>> +    TEST_TIMEOUT: 30
>>    script:
>>      - /opt/submit_tests.sh
>>    artifacts:
>> --
>> 2.17.1
>>
>> _______________________________________________
>> cip-dev mailing list
>> cip-dev@lists.cip-project.org
>> https://lists.cip-project.org/mailman/listinfo/cip-dev
> _______________________________________________
> cip-dev mailing list
> cip-dev@lists.cip-project.org
> https://lists.cip-project.org/mailman/listinfo/cip-dev
>

Patch
diff mbox series

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96eed0e0c81a..fb775f4950b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,16 +2,17 @@  variables:
   GIT_STRATEGY: clone
   GIT_DEPTH: 10
   DOCKER_DRIVER: overlay2
+  DOCKER_IMAGE_TAG: v2
 
-build_arm_renesas_shmobile_defconfig:
+arm_renesas_shmobile_defconfig:
   stage: build
-  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
+  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_TAG
   variables:
     BUILD_ARCH: arm
     CONFIG: renesas_shmobile_defconfig
     CONFIG_LOC: cip-kernel-config
     DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
-    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
+    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb
   script:
     - /opt/build_kernel.sh
   artifacts:
@@ -20,15 +21,15 @@  build_arm_renesas_shmobile_defconfig:
     paths:
       - output
 
-build_arm64_renesas_defconfig:
+arm64_renesas_defconfig:
   stage: build
-  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
+  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_TAG
   variables:
     BUILD_ARCH: arm64
     CONFIG: renesas_defconfig
     CONFIG_LOC: cip-kernel-config
     DEVICES: r8a774c0-ek874
-    DTBS: arch/arm64/boot/dts/renesas/r8a774c0-ek874.dtb
+    DTBS: r8a774c0-ek874.dtb
   script:
     - /opt/build_kernel.sh
   artifacts:
@@ -37,15 +38,15 @@  build_arm64_renesas_defconfig:
     paths:
       - output
 
-build_arm_shmobile_defconfig:
+arm_shmobile_defconfig:
   stage: build
-  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1
+  image: registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_TAG
   variables:
     BUILD_ARCH: arm
     CONFIG: shmobile_defconfig
     CONFIG_LOC: intree
     DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
-    DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
+    DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb
   script:
     - /opt/build_kernel.sh
   artifacts:
@@ -56,10 +57,11 @@  build_arm_shmobile_defconfig:
 
 run_tests:
   stage: test
-  image: registry.gitlab.com/cip-playground/linux-cip-ci:test-v1
+  image: registry.gitlab.com/cip-playground/linux-cip-ci:test-$DOCKER_IMAGE_TAG
   when: always
   variables:
     GIT_STRATEGY: none
+    TEST_TIMEOUT: 30
   script:
     - /opt/submit_tests.sh
   artifacts: