gitlab-ci: Remove limit on kernel logging

[mesa.git] / .gitlab-ci / lava-gitlab-ci.yml

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index f50f07abb244d524440514c143ac3790a3b3e76c..c6e0a96328f4fa0171d837e91e53503751847291 100644 (file)
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,30 +1,31 @@
-variables:
-    LAVA_DEBIAN_VERSION: testing-slim
-    LAVA_IMAGE_TAG: "lava-2019-10-23-1"
-
 include:
   - project: 'wayland/ci-templates'
-    ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
+    # Must be the same as in .gitlab-ci.yml
+    ref: f69acac60d5dde0410124fd5674764600821b7a6
     file: '/templates/debian.yml'
 
 # When to automatically run the CI
-.ci-run-policy:
+.lava-ci-run-policy:
   only:
     - branches@mesa/mesa
     - merge_requests
-    - /^ci([-/].*)?$/
+    - /^lava-ci([-/].*)?$/
   retry:
     max: 2
     when:
       - runner_system_failure
+  # Cancel CI run if a newer commit is pushed to the same branch
+  interruptible: true
 
 # Build Docker image with deqp, the rootfs and the build deps for Mesa
 .lava-container:
   extends:
     - .debian@container-ifnot-exists
     - .container
+    - .lava-ci-run-policy
   variables:
-    DEBIAN_TAG: '${DEBIAN_ARCH}-${LAVA_IMAGE_TAG}'
+    REPO_SUFFIX: ${CI_JOB_NAME}
+    DEBIAN_TAG:  &debian_tag '2019-10-23'
     DEBIAN_EXEC: 'DEBIAN_ARCH=${DEBIAN_ARCH}
                   GCC_ARCH=${GCC_ARCH}
                   KERNEL_ARCH=${KERNEL_ARCH}
@@ -32,10 +33,10 @@ include:
                   DEFCONFIG=${DEFCONFIG}
                   DEVICE_TREES="${DEVICE_TREES}"
                   KERNEL_IMAGE_NAME=${KERNEL_IMAGE_NAME}
-                  bash .gitlab-ci/lava-debian-install.sh'
-    DEBIAN_VERSION: ${LAVA_DEBIAN_VERSION}
+                  bash .gitlab-ci/container/lava_arm.sh'
+    DEBIAN_VERSION: testing-slim
 
-lava-container:armhf:
+lava_armhf:
   extends: .lava-container
   variables:
     DEBIAN_ARCH: "armhf"
@@ -46,7 +47,7 @@ lava-container:armhf:
     DEVICE_TREES: "arch/arm/boot/dts/rk3288-veyron-jaq.dtb arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb"
     KERNEL_IMAGE_NAME: "zImage"
 
-lava-container:arm64:
+lava_arm64:
   extends: .lava-container
   variables:
     DEBIAN_ARCH: "arm64"
@@ -58,9 +59,12 @@ lava-container:arm64:
     KERNEL_IMAGE_NAME: "Image"
 
 .lava-build:
-  image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:$DEBIAN_ARCH-$LAVA_IMAGE_TAG
+  variables:
+    TAG: *debian_tag
+  image: $CI_REGISTRY_IMAGE/debian/lava_${DEBIAN_ARCH}:$TAG
   extends:
     - .build-linux
+    - .lava-ci-run-policy
   script:
     # Build Mesa
     - mkdir -p results mesa-build
@@ -86,7 +90,7 @@ lava-container:arm64:
         -D gallium-xa=false
         -D gallium-nine=false
         -D llvm=false
-    - ninja -C mesa-build -j8
+    - ninja -C mesa-build -j4
     - ninja -C mesa-build install
     - find /artifacts/rootfs/mesa/lib -name \*.so -exec ${GCC_ARCH}-strip {} \;
 
@@ -119,7 +123,7 @@ lava-container:arm64:
 
 lava-build:armhf:
   extends: .lava-build
-  needs: ["lava-container:armhf"]
+  needs: ["lava_armhf"]
   variables:
     DEBIAN_ARCH: "armhf"
     GCC_ARCH: "arm-linux-gnueabihf"
@@ -128,7 +132,7 @@ lava-build:armhf:
 
 lava-build:arm64:
   extends: .lava-build
-  needs: ["lava-container:arm64"]
+  needs: ["lava_arm64"]
   variables:
     DEBIAN_ARCH: "arm64"
     GCC_ARCH: "aarch64-linux-gnu"
@@ -137,7 +141,12 @@ lava-build:arm64:
 
 .lava-test:
   extends:
-    - .test
+    - .lava-ci-run-policy
+  stage: test
+  variables:
+    GIT_STRATEGY: none # testing doesn't build anything from source
+    TAG: *debian_tag
+  image: $CI_REGISTRY_IMAGE/debian/lava_${DEBIAN_ARCH}:$TAG
   script:
     - lava_job_id=`lavacli jobs submit $CI_PROJECT_DIR/results/lava-deqp-$DEVICE_TYPE.yml`
     - echo $lava_job_id
@@ -152,19 +161,21 @@ lava-build:arm64:
       - results/
 
 .lava-test:armhf:
-  image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:armhf-$LAVA_IMAGE_TAG
+  variables:
+    DEBIAN_ARCH: armhf
   extends: .lava-test
   needs:
-    - lava-container:armhf
+    - lava_armhf
     - lava-build:armhf
   dependencies:
     - lava-build:armhf
 
 .lava-test:arm64:
-  image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:arm64-$LAVA_IMAGE_TAG
+  variables:
+    DEBIAN_ARCH: arm64
   extends: .lava-test
   needs:
-    - lava-container:arm64
+    - lava_arm64
     - lava-build:arm64
   dependencies:
     - lava-build:arm64