X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=a923dd7af0cbb52e96db9f8c2c567b25c24ab621;hb=ab74937b2c8880d3c084f792f37c6b8d953f9e4b;hp=40d6a71410122025441fb2fe0aca91ef8a4d8a1c;hpb=a2cce701e6dc94fb7c57195460d192645e125c90;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40d6a714101..a923dd7af0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,13 +16,15 @@
 # The format of the tag is "%Y-%m-%d-${counter}" where ${counter} stays
 # at "01" unless you have multiple updates on the same day :)
 variables:
-  UBUNTU_TAG: 2019-03-05-01
-  UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG"
-  UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG"
+  UPSTREAM_REPO: mesa/mesa
+  UBUNTU_TAG: "2019-04-02"
+  UBUNTU_VERSION: bionic
+  UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$UBUNTU_VERSION:$UBUNTU_TAG"
 
-cache:
-  paths:
-    - ccache
+include:
+  - project: 'wayland/ci-templates'
+    ref: c73dae8b84697ef18e2dbbf4fed7386d9652b0cd
+    file: '/templates/ubuntu.yml'
 
 stages:
   - containers-build
@@ -30,45 +32,37 @@ stages:
 
 
 # When to automatically run the CI
-.ci-run-policy:
+.ci-run-policy: &ci-run-policy
   only:
     - master
     - merge_requests
     - /^ci([-/].*)?$/
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
 
 
 # CONTAINERS
 
 ubuntu:
-  extends: .ci-run-policy
+  extends: .ubuntu@container-ifnot-exists
   stage: containers-build
-  image: docker:stable
-  services:
-    - docker:dind
+  <<: *ci-run-policy
   variables:
-    DOCKER_HOST: tcp://docker:2375
-    DOCKER_DRIVER: overlay2
-  script:
-    # Enable experimental features such as `docker manifest inspect`
-    - mkdir -p ~/.docker
-    - "echo '{\"experimental\": \"enabled\"}' > ~/.docker/config.json"
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    # Check if the image (with the specific tag) already exists
-    - docker manifest inspect $UBUNTU_IMAGE && exit || true
-    # Try to re-use the image from the main repository's registry
-    - docker image pull $UBUNTU_IMAGE_MAIN &&
-      docker image tag $UBUNTU_IMAGE_MAIN $UBUNTU_IMAGE &&
-      docker image push $UBUNTU_IMAGE && exit || true
-    - docker build -t $UBUNTU_IMAGE -f .gitlab-ci/Dockerfile.ubuntu .
-    - docker push $UBUNTU_IMAGE
+    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
+    UBUNTU_EXEC: 'bash .gitlab-ci/ubuntu-install.sh'
 
 
 # BUILD
 
 .build:
-  extends: .ci-run-policy
+  <<: *ci-run-policy
   image: $UBUNTU_IMAGE
   stage: build+test
+  cache:
+    paths:
+      - ccache
   artifacts:
     when: on_failure
     untracked: true
@@ -126,7 +120,7 @@ ubuntu:
 autotools:
   extends: .build
   variables:
-    MAKEFLAGS: "-j4"
+    MAKEFLAGS: "-j8"
     LLVM_CONFIG: llvm-config-7
   script:
     - mkdir build
@@ -167,8 +161,8 @@ meson-clang:
     UNWIND: "true"
     DRI_DRIVERS: "auto"
     GALLIUM_DRIVERS: "auto"
-    CC: clang-7
-    CXX: clang++-7
+    CC: "ccache clang-7"
+    CXX: "ccache clang++-7"
 
 meson-vulkan:
   extends: .meson-build