public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Petri Latvala <petri.latvala@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t 3/3] gitlab-CI: Do a build-test without any optional dependencies installed
Date: Wed, 29 May 2019 13:51:50 +0300	[thread overview]
Message-ID: <20190529105150.19050-3-petri.latvala@intel.com> (raw)
In-Reply-To: <20190529105150.19050-1-petri.latvala@intel.com>

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Simon Ser <simon.ser@intel.com>
---

Pipeline success without the first two extra patches:
https://gitlab.freedesktop.org/adrinael/igt-gpu-tools/pipelines/39284

Review-trap:

"
But Petri, surely it's better to make the normal build image depend
on the minimal one and just install the extra packages on top. This is
how you do it:

$howyoudoit
"



.gitlab-ci.yml            | 34 ++++++++++++++++++++++++++++++++++
 Dockerfile.debian-minimal | 24 ++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 Dockerfile.debian-minimal

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 771143a9..e29429e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,6 +68,16 @@ build:tests-debian-meson:
     paths:
       - meson-test-list.txt
 
+build:tests-debian-minimal:
+  image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal:latest
+  stage: build
+  script:
+    - meson -Dbuild_tests=disabled -Dwith_libdrm= build
+    - ninja -C build
+  artifacts:
+    paths:
+      - build
+
 build:tests-debian-meson-armhf:
   image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-armhf:latest
   stage: build
@@ -117,6 +127,13 @@ test:ninja-test-clang:
   stage: test
   script: ninja -C build test
 
+test:ninja-test-minimal:
+  image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal:latest
+  dependencies:
+    - build:tests-debian-minimal
+  stage: test
+  script: ninja -C build test
+
 test:ninja-test-arm64:
   image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-arm64:latest
   dependencies:
@@ -187,6 +204,23 @@ containers:igt-debian:
     - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian -f Dockerfile.debian .
     - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian
 
+containers:igt-debian-minimal:
+  stage: containers
+  image: docker:stable
+  only:
+    changes:
+      - Dockerfile.debian-minimal
+      - .gitlab-ci.yml
+  services:
+    - docker:dind
+  variables:
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_DRIVER: overlay2
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal -f Dockerfile.debian-minimal .
+    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal
+
 containers:igt-debian-armhf:
   stage: containers
   image: docker:stable
diff --git a/Dockerfile.debian-minimal b/Dockerfile.debian-minimal
new file mode 100644
index 00000000..bbe70bed
--- /dev/null
+++ b/Dockerfile.debian-minimal
@@ -0,0 +1,24 @@
+FROM debian:stretch-backports
+
+RUN apt-get update
+RUN apt-get install -y \
+			gcc \
+			flex \
+			bison \
+			pkg-config \
+			libpciaccess-dev \
+			libkmod-dev \
+			libprocps-dev \
+			libdw-dev \
+			zlib1g-dev \
+			liblzma-dev \
+			libcairo-dev \
+			libpixman-1-dev \
+			libudev-dev \
+			libxrandr-dev \
+			libxv-dev \
+			x11proto-dri2-dev
+
+RUN apt-get install -t stretch-backports -y \
+					meson \
+					libdrm-dev
-- 
2.19.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2019-05-29 10:52 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-29 10:51 [igt-dev] [PATCH i-g-t 1/3] meson: Remove redundant libdw from lib_deps Petri Latvala
2019-05-29 10:51 ` [igt-dev] [PATCH i-g-t 2/3] meson: Mark pciaccess and kmod as required Petri Latvala
2019-05-29 10:54   ` Ser, Simon
2019-05-29 10:57     ` Petri Latvala
2019-05-29 10:51 ` Petri Latvala [this message]
2019-05-29 11:07   ` [igt-dev] [PATCH i-g-t 3/3] gitlab-CI: Do a build-test without any optional dependencies installed Petri Latvala
2019-05-31 10:31   ` Ser, Simon
2019-05-29 10:55 ` [igt-dev] [PATCH i-g-t 1/3] meson: Remove redundant libdw from lib_deps Ser, Simon
2019-05-29 12:34 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/3] " Patchwork
2019-05-29 16:37 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190529105150.19050-3-petri.latvala@intel.com \
    --to=petri.latvala@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox