From aba78c2d389c83877d88d6ad9ff5c519e9e676a7 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 14 Oct 2019 23:52:58 +0100
Subject: [PATCH] gitlab-ci: set a common job parent for build stage
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
---
 .gitlab-ci.yml                | 11 +++++++----
 .gitlab-ci/lava-gitlab-ci.yml |  9 +--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c9b82c3898..5d1fb4292fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,6 @@ debian-10:
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
 
 .use-debian-10:
-  extends: .ci-run-policy
   image: $DEBIAN_IMAGE
   needs:
     - debian-10
@@ -106,7 +105,7 @@ test-container:arm64:
 # BUILD
 
 .build:
-  extends: .use-debian-10
+  extends: .ci-run-policy
   stage: build
   cache:
     key: ${CI_JOB_NAME}
@@ -140,12 +139,16 @@ test-container:arm64:
     - ccache --show-stats
 
 .meson-build:
-  extends: .build
+  extends:
+    - .build
+    - .use-debian-10
   script:
     - .gitlab-ci/meson-build.sh
 
 .scons-build:
-  extends: .build
+  extends:
+    - .build
+    - .use-debian-10
   variables:
     SCONSFLAGS: "-j4"
   script:
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index bcf4591cd46..b994118fd6d 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -58,16 +58,9 @@ lava-container:arm64:
     KERNEL_IMAGE_NAME: "Image"
 
 .lava-build:
-  stage: build
   image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:$DEBIAN_ARCH-$LAVA_IMAGE_TAG
   extends:
-    - .ci-run-policy
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - ccache
-  variables:
-    CCACHE_COMPILERCHECK: "content"
+    - .build
   # Use ccache transparently, and print stats before/after
   before_script:
     - mkdir -p results mesa-build
-- 
2.30.2