From 72219851701dd0c854c8c293ee4ab58fb60e0c57 Mon Sep 17 00:00:00 2001
From: Oleg Vasilev <oleg.vasilev@intel.com>
Date: Wed, 28 Aug 2019 15:48:41 +0300
Subject: gitlab-ci: introduce containers with IGT inside

Currently, the containers are used only to build IGT. We also want to
have an option to run IGT inside a container. For this, new build stage
is added.

v2: help touch-ups (Arek)

Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
 .gitlab-ci.yml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ac12318..df2b5f55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ stages:
   - build-containers
   - build
   - test
+  - containers
   - deploy
 
 ################# BUILD CONTAINERS #######################
@@ -85,12 +86,14 @@ build-containers:build-fedora:
 build:tests-fedora:
   stage: build
   script:
-    - meson $MESON_OPTIONS build
+    - meson --prefix=`pwd`/opt-igt $MESON_OPTIONS build
     - ninja -C build
+    - ninja -C build install
     - ninja -C build igt-gpu-tools-doc
   artifacts:
     paths:
       - build
+      - opt-igt
 
 build:tests-fedora-no-libunwind:
   stage: build
@@ -273,3 +276,22 @@ pages:
   only:
     - master
 
+############## CONTAINERS ####################
+
+
+containers:igt:
+  stage: containers
+  image: docker:stable
+  services:
+    - docker:dind
+  dependencies:
+    - build:tests-fedora
+  variables:
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_DRIVER: overlay2
+    FORCE_REBUILD: 1
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker pull $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:commit-$CI_COMMIT_SHA
+    - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:commit-$CI_COMMIT_SHA build-fedora
+    - .gitlab-ci/pull-or-rebuild.sh Dockerfile igt
-- 
cgit v1.2.3