* [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration
@ 2018-10-22 8:42 Arkadiusz Hiler
2018-10-22 9:03 ` Petri Latvala
` (5 more replies)
0 siblings, 6 replies; 19+ messages in thread
From: Arkadiusz Hiler @ 2018-10-22 8:42 UTC (permalink / raw)
To: igt-dev; +Cc: Petri Latvala, Daniel Vetter
The CI/CD pieline is configured the following way:
1. Build docker images and add them to repo's registry (manual step for
now, automation needs GitLab to be updated).
2. Build igt with meson on Debian and Feodra.
3. Run `ninja tests` on Fedora.
4. Build and publish docs as an artifact, for GitLab Pages.
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
.gitlab-ci.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++
Dockerfile.debian | 28 +++++++++++++++++++
Dockerfile.fedora | 24 +++++++++++++++++
3 files changed, 121 insertions(+)
create mode 100644 .gitlab-ci.yml
create mode 100644 Dockerfile.debian
create mode 100644 Dockerfile.fedora
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..0f3422a0
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,69 @@
+image: registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora:latest
+
+stages:
+ - containers
+ - build
+ - test
+ - deploy
+
+build:tests-fedora:
+ stage: build
+ script:
+ - meson build
+ - ninja -C build
+ artifacts:
+ paths:
+ - build
+
+build:tests-debian:
+ image: registry.freedesktop.org/drm/igt-gpu-tools/igt-debian:latest
+ stage: build
+ script:
+ - meson build
+ - ninja -C build
+
+ninja:test:
+ stage: test
+ script:
+ - ninja -C build test
+
+pages:
+ stage: deploy
+ script:
+ - ninja -C build igt-gpu-tools-doc
+ - cp -r build/docs/reference/igt-gpu-tools/html public
+ artifacts:
+ paths:
+ - public
+ only:
+ - master
+
+containers:igt-debian:
+ stage: containers
+ when: manual
+ image: docker:stable
+ services:
+ - docker:dind
+ variables:
+ DOCKER_HOST: tcp://docker:2375
+ DOCKER_DRIVER: overlay2
+ script:
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org
+ - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-debian -f Dockerfile.debian .
+ - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-debian
+
+containers:igt-fedora:
+ stage: containers
+ when: manual
+ image: docker:stable
+ services:
+ - docker:dind
+ variables:
+ DOCKER_HOST: tcp://docker:2375
+ DOCKER_DRIVER: overlay2
+ script:
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org
+ - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora -f Dockerfile.fedora .
+ - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora
diff --git a/Dockerfile.debian b/Dockerfile.debian
new file mode 100644
index 00000000..a9f93957
--- /dev/null
+++ b/Dockerfile.debian
@@ -0,0 +1,28 @@
+FROM debian:stretch-backports
+
+RUN apt-get update
+RUN apt-get install -y \
+ gcc \
+ flex \
+ bison \
+ pkg-config \
+ libpciaccess-dev \
+ libkmod-dev \
+ libprocps-dev \
+ libunwind-dev \
+ libdw-dev \
+ zlib1g-dev \
+ liblzma-dev \
+ libssl-dev \
+ libcairo-dev \
+ libudev-dev \
+ libgsl-dev \
+ libasound2-dev \
+ libxmlrpc-core-c3-dev \
+ libjson-c-dev \
+ libcurl4-openssl-dev
+
+RUN apt-get install -t stretch-backports -y \
+ meson \
+ libdrm-dev \
+ libdrm-intel1
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
new file mode 100644
index 00000000..58efa817
--- /dev/null
+++ b/Dockerfile.fedora
@@ -0,0 +1,24 @@
+FROM fedora:28
+
+RUN dnf install -y gcc \
+ flex \
+ meson \
+ bison \
+ json-c \
+ gtk-doc \
+ xdotool \
+ gsl-devel \
+ kmod-devel \
+ glib2-devel \
+ cairo-devel \
+ procps-devel \
+ pixman-devel \
+ libdrm-devel \
+ openssl-devel \
+ libudev-devel \
+ xmlrpc-c-devel \
+ elfutils-devel \
+ libunwind-devel \
+ python-docutils \
+ libpciaccess-devel \
+ alsa-lib-devel
--
2.17.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration 2018-10-22 8:42 [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration Arkadiusz Hiler @ 2018-10-22 9:03 ` Petri Latvala 2018-10-22 9:22 ` Daniel Vetter ` (4 subsequent siblings) 5 siblings, 0 replies; 19+ messages in thread From: Petri Latvala @ 2018-10-22 9:03 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: igt-dev, Daniel Vetter On Mon, Oct 22, 2018 at 11:42:03AM +0300, Arkadiusz Hiler wrote: > The CI/CD pieline is configured the following way: > 1. Build docker images and add them to repo's registry (manual step for > now, automation needs GitLab to be updated). > 2. Build igt with meson on Debian and Feodra. > 3. Run `ninja tests` on Fedora. > 4. Build and publish docs as an artifact, for GitLab Pages. > > Cc: Petri Latvala <petri.latvala@intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > --- > .gitlab-ci.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++ > Dockerfile.debian | 28 +++++++++++++++++++ > Dockerfile.fedora | 24 +++++++++++++++++ > 3 files changed, 121 insertions(+) > create mode 100644 .gitlab-ci.yml > create mode 100644 Dockerfile.debian > create mode 100644 Dockerfile.fedora > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > new file mode 100644 > index 00000000..0f3422a0 > --- /dev/null > +++ b/.gitlab-ci.yml > @@ -0,0 +1,69 @@ > +image: registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora:latest > + > +stages: > + - containers > + - build > + - test > + - deploy > + > +build:tests-fedora: > + stage: build > + script: > + - meson build > + - ninja -C build > + artifacts: > + paths: > + - build > + > +build:tests-debian: > + image: registry.freedesktop.org/drm/igt-gpu-tools/igt-debian:latest > + stage: build > + script: > + - meson build > + - ninja -C build How about explicitly enabling all optional parts from meson_options? Otherwise we don't notice breakages in parts that are not built due to changes in dependencies without changing the image package sets. Does this actually work now for the debian image, you're not installing pixman? -- Petri Latvala > + > +ninja:test: > + stage: test > + script: > + - ninja -C build test > + > +pages: > + stage: deploy > + script: > + - ninja -C build igt-gpu-tools-doc > + - cp -r build/docs/reference/igt-gpu-tools/html public > + artifacts: > + paths: > + - public > + only: > + - master > + > +containers:igt-debian: > + stage: containers > + when: manual > + image: docker:stable > + services: > + - docker:dind > + variables: > + DOCKER_HOST: tcp://docker:2375 > + DOCKER_DRIVER: overlay2 > + script: > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-debian -f Dockerfile.debian . > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-debian > + > +containers:igt-fedora: > + stage: containers > + when: manual > + image: docker:stable > + services: > + - docker:dind > + variables: > + DOCKER_HOST: tcp://docker:2375 > + DOCKER_DRIVER: overlay2 > + script: > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora -f Dockerfile.fedora . > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora > diff --git a/Dockerfile.debian b/Dockerfile.debian > new file mode 100644 > index 00000000..a9f93957 > --- /dev/null > +++ b/Dockerfile.debian > @@ -0,0 +1,28 @@ > +FROM debian:stretch-backports > + > +RUN apt-get update > +RUN apt-get install -y \ > + gcc \ > + flex \ > + bison \ > + pkg-config \ > + libpciaccess-dev \ > + libkmod-dev \ > + libprocps-dev \ > + libunwind-dev \ > + libdw-dev \ > + zlib1g-dev \ > + liblzma-dev \ > + libssl-dev \ > + libcairo-dev \ > + libudev-dev \ > + libgsl-dev \ > + libasound2-dev \ > + libxmlrpc-core-c3-dev \ > + libjson-c-dev \ > + libcurl4-openssl-dev > + > +RUN apt-get install -t stretch-backports -y \ > + meson \ > + libdrm-dev \ > + libdrm-intel1 > diff --git a/Dockerfile.fedora b/Dockerfile.fedora > new file mode 100644 > index 00000000..58efa817 > --- /dev/null > +++ b/Dockerfile.fedora > @@ -0,0 +1,24 @@ > +FROM fedora:28 > + > +RUN dnf install -y gcc \ > + flex \ > + meson \ > + bison \ > + json-c \ > + gtk-doc \ > + xdotool \ > + gsl-devel \ > + kmod-devel \ > + glib2-devel \ > + cairo-devel \ > + procps-devel \ > + pixman-devel \ > + libdrm-devel \ > + openssl-devel \ > + libudev-devel \ > + xmlrpc-c-devel \ > + elfutils-devel \ > + libunwind-devel \ > + python-docutils \ > + libpciaccess-devel \ > + alsa-lib-devel > -- > 2.17.2 > > _______________________________________________ > igt-dev mailing list > igt-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/igt-dev _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration 2018-10-22 8:42 [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration Arkadiusz Hiler 2018-10-22 9:03 ` Petri Latvala @ 2018-10-22 9:22 ` Daniel Vetter 2018-10-22 9:58 ` Arkadiusz Hiler 2018-10-22 9:47 ` Saarinen, Jani ` (3 subsequent siblings) 5 siblings, 1 reply; 19+ messages in thread From: Daniel Vetter @ 2018-10-22 9:22 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: igt-dev, Petri Latvala, Daniel Vetter On Mon, Oct 22, 2018 at 11:42:03AM +0300, Arkadiusz Hiler wrote: > The CI/CD pieline is configured the following way: > 1. Build docker images and add them to repo's registry (manual step for > now, automation needs GitLab to be updated). > 2. Build igt with meson on Debian and Feodra. > 3. Run `ninja tests` on Fedora. > 4. Build and publish docs as an artifact, for GitLab Pages. > > Cc: Petri Latvala <petri.latvala@intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > --- > .gitlab-ci.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++ > Dockerfile.debian | 28 +++++++++++++++++++ > Dockerfile.fedora | 24 +++++++++++++++++ > 3 files changed, 121 insertions(+) > create mode 100644 .gitlab-ci.yml > create mode 100644 Dockerfile.debian > create mode 100644 Dockerfile.fedora > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > new file mode 100644 > index 00000000..0f3422a0 > --- /dev/null > +++ b/.gitlab-ci.yml > @@ -0,0 +1,69 @@ > +image: registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora:latest > + > +stages: > + - containers > + - build > + - test > + - deploy > + > +build:tests-fedora: > + stage: build > + script: > + - meson build > + - ninja -C build > + artifacts: > + paths: > + - build > + > +build:tests-debian: > + image: registry.freedesktop.org/drm/igt-gpu-tools/igt-debian:latest > + stage: build > + script: > + - meson build > + - ninja -C build > + > +ninja:test: > + stage: test > + script: > + - ninja -C build test > + > +pages: > + stage: deploy > + script: > + - ninja -C build igt-gpu-tools-doc > + - cp -r build/docs/reference/igt-gpu-tools/html public > + artifacts: > + paths: > + - public > + only: > + - master > + > +containers:igt-debian: > + stage: containers > + when: manual > + image: docker:stable > + services: > + - docker:dind > + variables: > + DOCKER_HOST: tcp://docker:2375 > + DOCKER_DRIVER: overlay2 > + script: > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-debian -f Dockerfile.debian . > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-debian > + > +containers:igt-fedora: > + stage: containers > + when: manual How do you trigger this? Is there some button on the UI? Anyway, looks good enough to get us started. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Bits we could add: - debian stable build (atm only autotools) - build with the oldest meson we still claim to support (would need to git clone&install it in the docker image). Somewhat relevant since on oldest supported meson the docs building is different. - Petri's idea to have the equivalent of an allyesconfig build Cheers, Daniel > + image: docker:stable > + services: > + - docker:dind > + variables: > + DOCKER_HOST: tcp://docker:2375 > + DOCKER_DRIVER: overlay2 > + script: > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora -f Dockerfile.fedora . > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora > diff --git a/Dockerfile.debian b/Dockerfile.debian > new file mode 100644 > index 00000000..a9f93957 > --- /dev/null > +++ b/Dockerfile.debian > @@ -0,0 +1,28 @@ > +FROM debian:stretch-backports > + > +RUN apt-get update > +RUN apt-get install -y \ > + gcc \ > + flex \ > + bison \ > + pkg-config \ > + libpciaccess-dev \ > + libkmod-dev \ > + libprocps-dev \ > + libunwind-dev \ > + libdw-dev \ > + zlib1g-dev \ > + liblzma-dev \ > + libssl-dev \ > + libcairo-dev \ > + libudev-dev \ > + libgsl-dev \ > + libasound2-dev \ > + libxmlrpc-core-c3-dev \ > + libjson-c-dev \ > + libcurl4-openssl-dev > + > +RUN apt-get install -t stretch-backports -y \ > + meson \ > + libdrm-dev \ > + libdrm-intel1 > diff --git a/Dockerfile.fedora b/Dockerfile.fedora > new file mode 100644 > index 00000000..58efa817 > --- /dev/null > +++ b/Dockerfile.fedora > @@ -0,0 +1,24 @@ > +FROM fedora:28 > + > +RUN dnf install -y gcc \ > + flex \ > + meson \ > + bison \ > + json-c \ > + gtk-doc \ > + xdotool \ > + gsl-devel \ > + kmod-devel \ > + glib2-devel \ > + cairo-devel \ > + procps-devel \ > + pixman-devel \ > + libdrm-devel \ > + openssl-devel \ > + libudev-devel \ > + xmlrpc-c-devel \ > + elfutils-devel \ > + libunwind-devel \ > + python-docutils \ > + libpciaccess-devel \ > + alsa-lib-devel > -- > 2.17.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration 2018-10-22 9:22 ` Daniel Vetter @ 2018-10-22 9:58 ` Arkadiusz Hiler 2018-10-22 14:16 ` Daniel Vetter 0 siblings, 1 reply; 19+ messages in thread From: Arkadiusz Hiler @ 2018-10-22 9:58 UTC (permalink / raw) To: Daniel Vetter; +Cc: igt-dev, Petri Latvala On Mon, Oct 22, 2018 at 11:22:50AM +0200, Daniel Vetter wrote: > On Mon, Oct 22, 2018 at 11:42:03AM +0300, Arkadiusz Hiler wrote: > > The CI/CD pieline is configured the following way: > > 1. Build docker images and add them to repo's registry (manual step for > > now, automation needs GitLab to be updated). > > 2. Build igt with meson on Debian and Feodra. > > 3. Run `ninja tests` on Fedora. > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > --- > > .gitlab-ci.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++ > > Dockerfile.debian | 28 +++++++++++++++++++ > > Dockerfile.fedora | 24 +++++++++++++++++ > > 3 files changed, 121 insertions(+) > > create mode 100644 .gitlab-ci.yml > > create mode 100644 Dockerfile.debian > > create mode 100644 Dockerfile.fedora > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > new file mode 100644 > > index 00000000..0f3422a0 > > --- /dev/null > > +++ b/.gitlab-ci.yml > > @@ -0,0 +1,69 @@ > > +image: registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora:latest > > + > > +stages: > > + - containers > > + - build > > + - test > > + - deploy > > + > > +build:tests-fedora: > > + stage: build > > + script: > > + - meson build > > + - ninja -C build > > + artifacts: > > + paths: > > + - build > > + > > +build:tests-debian: > > + image: registry.freedesktop.org/drm/igt-gpu-tools/igt-debian:latest > > + stage: build > > + script: > > + - meson build > > + - ninja -C build > > + > > +ninja:test: > > + stage: test > > + script: > > + - ninja -C build test > > + > > +pages: > > + stage: deploy > > + script: > > + - ninja -C build igt-gpu-tools-doc > > + - cp -r build/docs/reference/igt-gpu-tools/html public > > + artifacts: > > + paths: > > + - public > > + only: > > + - master > > + > > +containers:igt-debian: > > + stage: containers > > + when: manual > > + image: docker:stable > > + services: > > + - docker:dind > > + variables: > > + DOCKER_HOST: tcp://docker:2375 > > + DOCKER_DRIVER: overlay2 > > + script: > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-debian -f Dockerfile.debian . > > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-debian > > + > > +containers:igt-fedora: > > + stage: containers > > + when: manual > > How do you trigger this? Is there some button on the UI? Yep. Once pipeline get triggered (either manually, through the API or by push) those jobs are having pause symbol as their status icon. By clicking on them you can make them run. I haven't checked how it looks from the API though. This should not be the case for too long, as GitLab 11.4 is already out, we just have to wait for FDO to catch up. https://gitlab.com/gitlab-org/gitlab-ce/issues/19232 > Anyway, looks good enough to get us started. > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Bits we could add: > - debian stable build (atm only autotools) I am not very keen on doing anything around autotools, and providing more cues that we are going to support it in any way. > - build with the oldest meson we still claim to support (would need to git > clone&install it in the docker image). Somewhat relevant since on oldest > supported meson the docs building is different. This would require us to have probably another docker image dedicated to do that, as doing dep managment in the actual build is both annoying and costs a lot of time. > - Petri's idea to have the equivalent of an allyesconfig build Yep. I was also thinking about doing some combinatorial build checks on IGT, but Petri's suggestion is lower hanging fruit and can be incorporated almost immediately. > Cheers, Daniel > > > + image: docker:stable > > + services: > > + - docker:dind > > + variables: > > + DOCKER_HOST: tcp://docker:2375 > > + DOCKER_DRIVER: overlay2 > > + script: > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora -f Dockerfile.fedora . > > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora > > diff --git a/Dockerfile.debian b/Dockerfile.debian > > new file mode 100644 > > index 00000000..a9f93957 > > --- /dev/null > > +++ b/Dockerfile.debian > > @@ -0,0 +1,28 @@ > > +FROM debian:stretch-backports > > + > > +RUN apt-get update > > +RUN apt-get install -y \ > > + gcc \ > > + flex \ > > + bison \ > > + pkg-config \ > > + libpciaccess-dev \ > > + libkmod-dev \ > > + libprocps-dev \ > > + libunwind-dev \ > > + libdw-dev \ > > + zlib1g-dev \ > > + liblzma-dev \ > > + libssl-dev \ > > + libcairo-dev \ > > + libudev-dev \ > > + libgsl-dev \ > > + libasound2-dev \ > > + libxmlrpc-core-c3-dev \ > > + libjson-c-dev \ > > + libcurl4-openssl-dev > > + > > +RUN apt-get install -t stretch-backports -y \ > > + meson \ > > + libdrm-dev \ > > + libdrm-intel1 > > diff --git a/Dockerfile.fedora b/Dockerfile.fedora > > new file mode 100644 > > index 00000000..58efa817 > > --- /dev/null > > +++ b/Dockerfile.fedora > > @@ -0,0 +1,24 @@ > > +FROM fedora:28 > > + > > +RUN dnf install -y gcc \ > > + flex \ > > + meson \ > > + bison \ > > + json-c \ > > + gtk-doc \ > > + xdotool \ > > + gsl-devel \ > > + kmod-devel \ > > + glib2-devel \ > > + cairo-devel \ > > + procps-devel \ > > + pixman-devel \ > > + libdrm-devel \ > > + openssl-devel \ > > + libudev-devel \ > > + xmlrpc-c-devel \ > > + elfutils-devel \ > > + libunwind-devel \ > > + python-docutils \ > > + libpciaccess-devel \ > > + alsa-lib-devel > > -- > > 2.17.2 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration 2018-10-22 9:58 ` Arkadiusz Hiler @ 2018-10-22 14:16 ` Daniel Vetter 2018-10-22 14:31 ` Arkadiusz Hiler 0 siblings, 1 reply; 19+ messages in thread From: Daniel Vetter @ 2018-10-22 14:16 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: IGT development, Petri Latvala On Mon, Oct 22, 2018 at 11:58 AM Arkadiusz Hiler <arkadiusz.hiler@intel.com> wrote: > > On Mon, Oct 22, 2018 at 11:22:50AM +0200, Daniel Vetter wrote: > > On Mon, Oct 22, 2018 at 11:42:03AM +0300, Arkadiusz Hiler wrote: > > > The CI/CD pieline is configured the following way: > > > 1. Build docker images and add them to repo's registry (manual step for > > > now, automation needs GitLab to be updated). > > > 2. Build igt with meson on Debian and Feodra. > > > 3. Run `ninja tests` on Fedora. > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > --- > > > .gitlab-ci.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++ > > > Dockerfile.debian | 28 +++++++++++++++++++ > > > Dockerfile.fedora | 24 +++++++++++++++++ > > > 3 files changed, 121 insertions(+) > > > create mode 100644 .gitlab-ci.yml > > > create mode 100644 Dockerfile.debian > > > create mode 100644 Dockerfile.fedora > > > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > > new file mode 100644 > > > index 00000000..0f3422a0 > > > --- /dev/null > > > +++ b/.gitlab-ci.yml > > > @@ -0,0 +1,69 @@ > > > +image: registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora:latest > > > + > > > +stages: > > > + - containers > > > + - build > > > + - test > > > + - deploy > > > + > > > +build:tests-fedora: > > > + stage: build > > > + script: > > > + - meson build > > > + - ninja -C build > > > + artifacts: > > > + paths: > > > + - build > > > + > > > +build:tests-debian: > > > + image: registry.freedesktop.org/drm/igt-gpu-tools/igt-debian:latest > > > + stage: build > > > + script: > > > + - meson build > > > + - ninja -C build > > > + > > > +ninja:test: > > > + stage: test > > > + script: > > > + - ninja -C build test > > > + > > > +pages: > > > + stage: deploy > > > + script: > > > + - ninja -C build igt-gpu-tools-doc > > > + - cp -r build/docs/reference/igt-gpu-tools/html public > > > + artifacts: > > > + paths: > > > + - public > > > + only: > > > + - master > > > + > > > +containers:igt-debian: > > > + stage: containers > > > + when: manual > > > + image: docker:stable > > > + services: > > > + - docker:dind > > > + variables: > > > + DOCKER_HOST: tcp://docker:2375 > > > + DOCKER_DRIVER: overlay2 > > > + script: > > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-debian -f Dockerfile.debian . > > > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-debian > > > + > > > +containers:igt-fedora: > > > + stage: containers > > > + when: manual > > > > How do you trigger this? Is there some button on the UI? > > Yep. Once pipeline get triggered (either manually, through the API or by > push) those jobs are having pause symbol as their status icon. By > clicking on them you can make them run. I haven't checked how it looks > from the API though. > > This should not be the case for too long, as GitLab 11.4 is already out, > we just have to wait for FDO to catch up. > > https://gitlab.com/gitlab-org/gitlab-ce/issues/19232 > > > Anyway, looks good enough to get us started. > > > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > > > Bits we could add: > > - debian stable build (atm only autotools) > > I am not very keen on doing anything around autotools, and providing > more cues that we are going to support it in any way. It's more about "being able to build on old stuff" and not "being able to build using autotools. I think debian stable is a fairly well-accepted target for "old, but still worth supporting". Unfortunately our current meson build doesn't work on debian stable, hence autotools. As soon as the next debian release is out there, we can switch that over to meson I think. > > - build with the oldest meson we still claim to support (would need to git > > clone&install it in the docker image). Somewhat relevant since on oldest > > supported meson the docs building is different. > > This would require us to have probably another docker image dedicated to > do that, as doing dep managment in the actual build is both annoying > and costs a lot of time. Yeah, which is somewhat annoying. But "waiting until the next debian stable release", which is somewhen in late 2019 most likely, is a bit long ... -Daniel > > > - Petri's idea to have the equivalent of an allyesconfig build > > Yep. I was also thinking about doing some combinatorial build checks on > IGT, but Petri's suggestion is lower hanging fruit and can be > incorporated almost immediately. > > > Cheers, Daniel > > > > > + image: docker:stable > > > + services: > > > + - docker:dind > > > + variables: > > > + DOCKER_HOST: tcp://docker:2375 > > > + DOCKER_DRIVER: overlay2 > > > + script: > > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora -f Dockerfile.fedora . > > > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora > > > diff --git a/Dockerfile.debian b/Dockerfile.debian > > > new file mode 100644 > > > index 00000000..a9f93957 > > > --- /dev/null > > > +++ b/Dockerfile.debian > > > @@ -0,0 +1,28 @@ > > > +FROM debian:stretch-backports > > > + > > > +RUN apt-get update > > > +RUN apt-get install -y \ > > > + gcc \ > > > + flex \ > > > + bison \ > > > + pkg-config \ > > > + libpciaccess-dev \ > > > + libkmod-dev \ > > > + libprocps-dev \ > > > + libunwind-dev \ > > > + libdw-dev \ > > > + zlib1g-dev \ > > > + liblzma-dev \ > > > + libssl-dev \ > > > + libcairo-dev \ > > > + libudev-dev \ > > > + libgsl-dev \ > > > + libasound2-dev \ > > > + libxmlrpc-core-c3-dev \ > > > + libjson-c-dev \ > > > + libcurl4-openssl-dev > > > + > > > +RUN apt-get install -t stretch-backports -y \ > > > + meson \ > > > + libdrm-dev \ > > > + libdrm-intel1 > > > diff --git a/Dockerfile.fedora b/Dockerfile.fedora > > > new file mode 100644 > > > index 00000000..58efa817 > > > --- /dev/null > > > +++ b/Dockerfile.fedora > > > @@ -0,0 +1,24 @@ > > > +FROM fedora:28 > > > + > > > +RUN dnf install -y gcc \ > > > + flex \ > > > + meson \ > > > + bison \ > > > + json-c \ > > > + gtk-doc \ > > > + xdotool \ > > > + gsl-devel \ > > > + kmod-devel \ > > > + glib2-devel \ > > > + cairo-devel \ > > > + procps-devel \ > > > + pixman-devel \ > > > + libdrm-devel \ > > > + openssl-devel \ > > > + libudev-devel \ > > > + xmlrpc-c-devel \ > > > + elfutils-devel \ > > > + libunwind-devel \ > > > + python-docutils \ > > > + libpciaccess-devel \ > > > + alsa-lib-devel > > > -- > > > 2.17.2 > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration 2018-10-22 14:16 ` Daniel Vetter @ 2018-10-22 14:31 ` Arkadiusz Hiler 0 siblings, 0 replies; 19+ messages in thread From: Arkadiusz Hiler @ 2018-10-22 14:31 UTC (permalink / raw) To: Daniel Vetter; +Cc: IGT development, Petri Latvala On Mon, Oct 22, 2018 at 04:16:50PM +0200, Daniel Vetter wrote: > On Mon, Oct 22, 2018 at 11:58 AM Arkadiusz Hiler > <arkadiusz.hiler@intel.com> wrote: > > > > On Mon, Oct 22, 2018 at 11:22:50AM +0200, Daniel Vetter wrote: > > > On Mon, Oct 22, 2018 at 11:42:03AM +0300, Arkadiusz Hiler wrote: > > > > The CI/CD pieline is configured the following way: > > > > 1. Build docker images and add them to repo's registry (manual step for > > > > now, automation needs GitLab to be updated). > > > > 2. Build igt with meson on Debian and Feodra. > > > > 3. Run `ninja tests` on Fedora. > > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > > --- > > > > .gitlab-ci.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++ > > > > Dockerfile.debian | 28 +++++++++++++++++++ > > > > Dockerfile.fedora | 24 +++++++++++++++++ > > > > 3 files changed, 121 insertions(+) > > > > create mode 100644 .gitlab-ci.yml > > > > create mode 100644 Dockerfile.debian > > > > create mode 100644 Dockerfile.fedora > > > > > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > > > new file mode 100644 > > > > index 00000000..0f3422a0 > > > > --- /dev/null > > > > +++ b/.gitlab-ci.yml > > > > @@ -0,0 +1,69 @@ > > > > +image: registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora:latest > > > > + > > > > +stages: > > > > + - containers > > > > + - build > > > > + - test > > > > + - deploy > > > > + > > > > +build:tests-fedora: > > > > + stage: build > > > > + script: > > > > + - meson build > > > > + - ninja -C build > > > > + artifacts: > > > > + paths: > > > > + - build > > > > + > > > > +build:tests-debian: > > > > + image: registry.freedesktop.org/drm/igt-gpu-tools/igt-debian:latest > > > > + stage: build > > > > + script: > > > > + - meson build > > > > + - ninja -C build > > > > + > > > > +ninja:test: > > > > + stage: test > > > > + script: > > > > + - ninja -C build test > > > > + > > > > +pages: > > > > + stage: deploy > > > > + script: > > > > + - ninja -C build igt-gpu-tools-doc > > > > + - cp -r build/docs/reference/igt-gpu-tools/html public > > > > + artifacts: > > > > + paths: > > > > + - public > > > > + only: > > > > + - master > > > > + > > > > +containers:igt-debian: > > > > + stage: containers > > > > + when: manual > > > > + image: docker:stable > > > > + services: > > > > + - docker:dind > > > > + variables: > > > > + DOCKER_HOST: tcp://docker:2375 > > > > + DOCKER_DRIVER: overlay2 > > > > + script: > > > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > > > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > > > > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-debian -f Dockerfile.debian . > > > > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-debian > > > > + > > > > +containers:igt-fedora: > > > > + stage: containers > > > > + when: manual > > > > > > How do you trigger this? Is there some button on the UI? > > > > Yep. Once pipeline get triggered (either manually, through the API or by > > push) those jobs are having pause symbol as their status icon. By > > clicking on them you can make them run. I haven't checked how it looks > > from the API though. > > > > This should not be the case for too long, as GitLab 11.4 is already out, > > we just have to wait for FDO to catch up. > > > > https://gitlab.com/gitlab-org/gitlab-ce/issues/19232 > > > > > Anyway, looks good enough to get us started. > > > > > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > > > > > Bits we could add: > > > - debian stable build (atm only autotools) > > > > I am not very keen on doing anything around autotools, and providing > > more cues that we are going to support it in any way. > > It's more about "being able to build on old stuff" and not "being able > to build using autotools. I think debian stable is a fairly > well-accepted target for "old, but still worth supporting". > Unfortunately our current meson build doesn't work on debian stable, > hence autotools. As soon as the next debian release is out there, we > can switch that over to meson I think. Depends how people treat backports, but if I stretch my imagination I can see some point in that. > > > - build with the oldest meson we still claim to support (would need to git > > > clone&install it in the docker image). Somewhat relevant since on oldest > > > supported meson the docs building is different. > > > > This would require us to have probably another docker image dedicated to > > do that, as doing dep managment in the actual build is both annoying > > and costs a lot of time. > > Yeah, which is somewhat annoying. But "waiting until the next debian > stable release", which is somewhen in late 2019 most likely, is a bit > long ... > -Daniel I can't wait for 2019 then. -Arek _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration 2018-10-22 8:42 [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration Arkadiusz Hiler 2018-10-22 9:03 ` Petri Latvala 2018-10-22 9:22 ` Daniel Vetter @ 2018-10-22 9:47 ` Saarinen, Jani 2018-10-22 12:09 ` [igt-dev] [PATCH i-g-t v2] " Arkadiusz Hiler ` (2 subsequent siblings) 5 siblings, 0 replies; 19+ messages in thread From: Saarinen, Jani @ 2018-10-22 9:47 UTC (permalink / raw) To: Hiler, Arkadiusz, igt-dev@lists.freedesktop.org Cc: Latvala, Petri, Daniel Vetter > -----Original Message----- > From: igt-dev [mailto:igt-dev-bounces@lists.freedesktop.org] On Behalf Of > Arkadiusz Hiler > Sent: maanantai 22. lokakuuta 2018 11.42 > To: igt-dev@lists.freedesktop.org > Cc: Latvala, Petri <petri.latvala@intel.com>; Daniel Vetter <daniel@ffwll.ch> > Subject: [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration > > The CI/CD pieline is configured the following way: ^^ pipeline? > 1. Build docker images and add them to repo's registry (manual step for now, automation needs GitLab to be updated). > 2. Build igt with meson on Debian and Feodra. ^^ Fedora > 3. Run `ninja tests` on Fedora. > 4. Build and publish docs as an artifact, for GitLab Pages. > > Cc: Petri Latvala <petri.latvala@intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > --- > .gitlab-ci.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++ > Dockerfile.debian | 28 +++++++++++++++++++ Dockerfile.fedora | 24 > +++++++++++++++++ > 3 files changed, 121 insertions(+) > create mode 100644 .gitlab-ci.yml > create mode 100644 Dockerfile.debian > create mode 100644 Dockerfile.fedora > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index > 00000000..0f3422a0 > --- /dev/null > +++ b/.gitlab-ci.yml > @@ -0,0 +1,69 @@ > +image: registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora:latest > + > +stages: > + - containers > + - build > + - test > + - deploy > + > +build:tests-fedora: > + stage: build > + script: > + - meson build > + - ninja -C build > + artifacts: > + paths: > + - build > + > +build:tests-debian: > + image: registry.freedesktop.org/drm/igt-gpu-tools/igt-debian:latest > + stage: build > + script: > + - meson build > + - ninja -C build > + > +ninja:test: > + stage: test > + script: > + - ninja -C build test > + > +pages: > + stage: deploy > + script: > + - ninja -C build igt-gpu-tools-doc > + - cp -r build/docs/reference/igt-gpu-tools/html public > + artifacts: > + paths: > + - public > + only: > + - master > + > +containers:igt-debian: > + stage: containers > + when: manual > + image: docker:stable > + services: > + - docker:dind > + variables: > + DOCKER_HOST: tcp://docker:2375 > + DOCKER_DRIVER: overlay2 > + script: > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-debian -f > Dockerfile.debian . > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-debian > + > +containers:igt-fedora: > + stage: containers > + when: manual > + image: docker:stable > + services: > + - docker:dind > + variables: > + DOCKER_HOST: tcp://docker:2375 > + DOCKER_DRIVER: overlay2 > + script: > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org > + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora -f > Dockerfile.fedora . > + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora > diff --git a/Dockerfile.debian b/Dockerfile.debian new file mode 100644 index > 00000000..a9f93957 > --- /dev/null > +++ b/Dockerfile.debian > @@ -0,0 +1,28 @@ > +FROM debian:stretch-backports > + > +RUN apt-get update > +RUN apt-get install -y \ > + gcc \ > + flex \ > + bison \ > + pkg-config \ > + libpciaccess-dev \ > + libkmod-dev \ > + libprocps-dev \ > + libunwind-dev \ > + libdw-dev \ > + zlib1g-dev \ > + liblzma-dev \ > + libssl-dev \ > + libcairo-dev \ > + libudev-dev \ > + libgsl-dev \ > + libasound2-dev \ > + libxmlrpc-core-c3-dev \ > + libjson-c-dev \ > + libcurl4-openssl-dev > + > +RUN apt-get install -t stretch-backports -y \ > + meson \ > + libdrm-dev \ > + libdrm-intel1 > diff --git a/Dockerfile.fedora b/Dockerfile.fedora new file mode 100644 index > 00000000..58efa817 > --- /dev/null > +++ b/Dockerfile.fedora > @@ -0,0 +1,24 @@ > +FROM fedora:28 > + > +RUN dnf install -y gcc \ > + flex \ > + meson \ > + bison \ > + json-c \ > + gtk-doc \ > + xdotool \ > + gsl-devel \ > + kmod-devel \ > + glib2-devel \ > + cairo-devel \ > + procps-devel \ > + pixman-devel \ > + libdrm-devel \ > + openssl-devel \ > + libudev-devel \ > + xmlrpc-c-devel \ > + elfutils-devel \ > + libunwind-devel \ > + python-docutils \ > + libpciaccess-devel \ > + alsa-lib-devel > -- > 2.17.2 > > _______________________________________________ > igt-dev mailing list > igt-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/igt-dev _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-22 8:42 [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration Arkadiusz Hiler ` (2 preceding siblings ...) 2018-10-22 9:47 ` Saarinen, Jani @ 2018-10-22 12:09 ` Arkadiusz Hiler 2018-10-22 14:14 ` Arkadiusz Hiler 2018-10-22 20:43 ` [igt-dev] ✓ Fi.CI.BAT: success for Add GitLab's CI/CD configuration (rev2) Patchwork 2018-10-22 22:33 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 5 siblings, 1 reply; 19+ messages in thread From: Arkadiusz Hiler @ 2018-10-22 12:09 UTC (permalink / raw) To: igt-dev; +Cc: Petri Latvala, Daniel Vetter The CI/CD pipeline is configured the following way: 1. Build docker images and add them to repo's registry (manual step for now, automation needs GitLab to be updated). 2. Build igt with meson on Debian and Fedora. 3. Run `ninja tests` on Fedora. 4. Build and publish docs as an artifact, for GitLab Pages. v2: Typos and fully-featured meson build. Cc: Petri Latvala <petri.latvala@intel.com> Cc: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> --- .gitlab-ci.yml | 78 +++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile.debian | 34 +++++++++++++++++++++ Dockerfile.fedora | 36 ++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile.debian create mode 100644 Dockerfile.fedora diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..27dcb769 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,78 @@ +image: registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora:latest +variables: + MESON_OPTIONS: > + -Dwith_libdrm=intel,nouveau,amdgpu + -Dbuild_overlay=true + -Dbuild_audio=true + -Dbuild_chamelium=true + -Dwith_valgrind=true + -Dbuild_man=true + -Dbuild_tests=true + -Dbuild_runner=true + +stages: + - containers + - build + - test + - deploy + +build:tests-fedora: + stage: build + script: + # Feodora does not have peg packaged + - meson $MESON_OPTIONS build + - ninja -C build + artifacts: + paths: + - build + +build:tests-debian: + image: registry.freedesktop.org/drm/igt-gpu-tools/igt-debian:latest + stage: build + script: + - meson $MESON_OPTIONS build + - ninja -C build + +ninja:test: + stage: test + script: + - ninja -C build test + +pages: + stage: deploy + script: + - ninja -C build igt-gpu-tools-doc + - cp -r build/docs/reference/igt-gpu-tools/html public + artifacts: + paths: + - public + only: + - master + +containers:igt-debian: + stage: containers + when: manual + image: docker:stable + services: + - docker:dind + variables: + DOCKER_HOST: tcp://docker:2375 + DOCKER_DRIVER: overlay2 + script: + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-debian -f Dockerfile.debian . + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-debian + +containers:igt-fedora: + stage: containers + when: manual + image: docker:stable + services: + - docker:dind + variables: + DOCKER_HOST: tcp://docker:2375 + DOCKER_DRIVER: overlay2 + script: + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.freedesktop.org + - docker build -t registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora -f Dockerfile.fedora . + - docker push registry.freedesktop.org/drm/igt-gpu-tools/igt-fedora diff --git a/Dockerfile.debian b/Dockerfile.debian new file mode 100644 index 00000000..9a966086 --- /dev/null +++ b/Dockerfile.debian @@ -0,0 +1,34 @@ +FROM debian:stretch-backports + +RUN apt-get update +RUN apt-get install -y \ + gcc \ + flex \ + bison \ + pkg-config \ + libpciaccess-dev \ + libkmod-dev \ + libprocps-dev \ + libunwind-dev \ + libdw-dev \ + zlib1g-dev \ + liblzma-dev \ + libssl-dev \ + libcairo-dev \ + libudev-dev \ + libgsl-dev \ + libasound2-dev \ + libxmlrpc-core-c3-dev \ + libjson-c-dev \ + libcurl4-openssl-dev \ + libxrandr-dev \ + libxv-dev \ + x11proto-dri2-dev \ + python-docutils \ + valgrind \ + peg + +RUN apt-get install -t stretch-backports -y \ + meson \ + libdrm-dev \ + libdrm-intel1 diff --git a/Dockerfile.fedora b/Dockerfile.fedora new file mode 100644 index 00000000..341a0ed7 --- /dev/null +++ b/Dockerfile.fedora @@ -0,0 +1,36 @@ +FROM fedora:28 + +RUN dnf install -y gcc \ + flex \ + meson \ + bison \ + gtk-doc \ + xdotool \ + gsl-devel \ + kmod-devel \ + glib2-devel \ + cairo-devel \ + procps-devel \ + pixman-devel \ + json-c-devel \ + libdrm-devel \ + openssl-devel \ + libudev-devel \ + xmlrpc-c-devel \ + elfutils-devel \ + libunwind-devel \ + python-docutils \ + libpciaccess-devel \ + alsa-lib-devel \ + valgrind-devel \ + libXrandr-devel \ + libXv-devel + +# We need peg to build overlay +RUN dnf install -y make +RUN mkdir /tmp/peg +WORKDIR /tmp/peg +RUN curl -O http://piumarta.com/software/peg/peg-0.1.18.tar.gz +RUN tar xf peg-0.1.18.tar.gz +RUN cd peg-0.1.18 && make PREFIX=/usr install +RUN rm -fr /tmp/peg -- 2.17.2 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-22 12:09 ` [igt-dev] [PATCH i-g-t v2] " Arkadiusz Hiler @ 2018-10-22 14:14 ` Arkadiusz Hiler 2018-10-22 14:18 ` Daniel Vetter 0 siblings, 1 reply; 19+ messages in thread From: Arkadiusz Hiler @ 2018-10-22 14:14 UTC (permalink / raw) To: igt-dev; +Cc: Petri Latvala, Daniel Vetter On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > The CI/CD pipeline is configured the following way: > 1. Build docker images and add them to repo's registry (manual step for > now, automation needs GitLab to be updated). > 2. Build igt with meson on Debian and Fedora. > 3. Run `ninja tests` on Fedora. > 4. Build and publish docs as an artifact, for GitLab Pages. > > v2: Typos and fully-featured meson build. > > Cc: Petri Latvala <petri.latvala@intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Both images are already in our registry. Here you can see the pipline running (on a testing branch): https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 There's no pages stage, as it is limited to master branch only. I've got it tested in my private repo: https://gitlab.freedesktop.org/ivyl/igt/pipelines/5159 -- Cheers, Arek _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-22 14:14 ` Arkadiusz Hiler @ 2018-10-22 14:18 ` Daniel Vetter 2018-10-22 14:24 ` Arkadiusz Hiler 0 siblings, 1 reply; 19+ messages in thread From: Daniel Vetter @ 2018-10-22 14:18 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: IGT development, Petri Latvala On Mon, Oct 22, 2018 at 4:15 PM Arkadiusz Hiler <arkadiusz.hiler@intel.com> wrote: > > On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > > The CI/CD pipeline is configured the following way: > > 1. Build docker images and add them to repo's registry (manual step for > > now, automation needs GitLab to be updated). > > 2. Build igt with meson on Debian and Fedora. > > 3. Run `ninja tests` on Fedora. > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > v2: Typos and fully-featured meson build. > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > Both images are already in our registry. > > Here you can see the pipline running (on a testing branch): > https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 I think the "proper" gitlab way of doing this is not through a temporary branch, but through a merge request. Or a personal fork. Gives you the exact same amount of gitlab-ci testing as a branch. Just an aside, figure we'll start with the process bikeshedding right away :-) -Daniel > There's no pages stage, as it is limited to master branch only. > I've got it tested in my private repo: > https://gitlab.freedesktop.org/ivyl/igt/pipelines/5159 > > -- > Cheers, > Arek -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-22 14:18 ` Daniel Vetter @ 2018-10-22 14:24 ` Arkadiusz Hiler 2018-10-22 14:25 ` Daniel Vetter 0 siblings, 1 reply; 19+ messages in thread From: Arkadiusz Hiler @ 2018-10-22 14:24 UTC (permalink / raw) To: Daniel Vetter; +Cc: IGT development, Petri Latvala On Mon, Oct 22, 2018 at 04:18:56PM +0200, Daniel Vetter wrote: > On Mon, Oct 22, 2018 at 4:15 PM Arkadiusz Hiler > <arkadiusz.hiler@intel.com> wrote: > > > > On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > > > The CI/CD pipeline is configured the following way: > > > 1. Build docker images and add them to repo's registry (manual step for > > > now, automation needs GitLab to be updated). > > > 2. Build igt with meson on Debian and Fedora. > > > 3. Run `ninja tests` on Fedora. > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > v2: Typos and fully-featured meson build. > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > > Both images are already in our registry. > > > > Here you can see the pipline running (on a testing branch): > > https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 > > I think the "proper" gitlab way of doing this is not through a > temporary branch, but through a merge request. Or a personal fork. > Gives you the exact same amount of gitlab-ci testing as a branch. Just > an aside, figure we'll start with the process bikeshedding right away > :-) > -Daniel I was playing with that on my fork, but the issue was that I would have to change the paths to registry each time I send a patch and push it to my repo. Too annoying, so I went with a temporary branch. -- Cheers, Arek _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-22 14:24 ` Arkadiusz Hiler @ 2018-10-22 14:25 ` Daniel Vetter 2018-10-22 14:38 ` Arkadiusz Hiler 0 siblings, 1 reply; 19+ messages in thread From: Daniel Vetter @ 2018-10-22 14:25 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: IGT development, Petri Latvala On Mon, Oct 22, 2018 at 4:24 PM Arkadiusz Hiler <arkadiusz.hiler@intel.com> wrote: > > On Mon, Oct 22, 2018 at 04:18:56PM +0200, Daniel Vetter wrote: > > On Mon, Oct 22, 2018 at 4:15 PM Arkadiusz Hiler > > <arkadiusz.hiler@intel.com> wrote: > > > > > > On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > > > > The CI/CD pipeline is configured the following way: > > > > 1. Build docker images and add them to repo's registry (manual step for > > > > now, automation needs GitLab to be updated). > > > > 2. Build igt with meson on Debian and Fedora. > > > > 3. Run `ninja tests` on Fedora. > > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > > > v2: Typos and fully-featured meson build. > > > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > > > > Both images are already in our registry. > > > > > > Here you can see the pipline running (on a testing branch): > > > https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 > > > > I think the "proper" gitlab way of doing this is not through a > > temporary branch, but through a merge request. Or a personal fork. > > Gives you the exact same amount of gitlab-ci testing as a branch. Just > > an aside, figure we'll start with the process bikeshedding right away > > :-) > > -Daniel > > I was playing with that on my fork, but the issue was that I would have > to change the paths to registry each time I send a patch and push it to > my repo. Too annoying, so I went with a temporary branch. If you do an MR, does it work better? -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-22 14:25 ` Daniel Vetter @ 2018-10-22 14:38 ` Arkadiusz Hiler 2018-10-22 14:59 ` Daniel Vetter 0 siblings, 1 reply; 19+ messages in thread From: Arkadiusz Hiler @ 2018-10-22 14:38 UTC (permalink / raw) To: Daniel Vetter; +Cc: IGT development, Petri Latvala On Mon, Oct 22, 2018 at 04:25:50PM +0200, Daniel Vetter wrote: > On Mon, Oct 22, 2018 at 4:24 PM Arkadiusz Hiler > <arkadiusz.hiler@intel.com> wrote: > > > > On Mon, Oct 22, 2018 at 04:18:56PM +0200, Daniel Vetter wrote: > > > On Mon, Oct 22, 2018 at 4:15 PM Arkadiusz Hiler > > > <arkadiusz.hiler@intel.com> wrote: > > > > > > > > On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > > > > > The CI/CD pipeline is configured the following way: > > > > > 1. Build docker images and add them to repo's registry (manual step for > > > > > now, automation needs GitLab to be updated). > > > > > 2. Build igt with meson on Debian and Fedora. > > > > > 3. Run `ninja tests` on Fedora. > > > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > > > > > v2: Typos and fully-featured meson build. > > > > > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > > > > > > Both images are already in our registry. > > > > > > > > Here you can see the pipline running (on a testing branch): > > > > https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 > > > > > > I think the "proper" gitlab way of doing this is not through a > > > temporary branch, but through a merge request. Or a personal fork. > > > Gives you the exact same amount of gitlab-ci testing as a branch. Just > > > an aside, figure we'll start with the process bikeshedding right away > > > :-) > > > -Daniel > > > > I was playing with that on my fork, but the issue was that I would have > > to change the paths to registry each time I send a patch and push it to > > my repo. Too annoying, so I went with a temporary branch. > > If you do an MR, does it work better? > -Daniel They are disabled for IGT, which kind of makes sense, as we do not take contributions that way (yet?) - there's no proper CI for MRs. -- Cheers, Arek _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-22 14:38 ` Arkadiusz Hiler @ 2018-10-22 14:59 ` Daniel Vetter 2018-10-23 7:32 ` Arkadiusz Hiler 0 siblings, 1 reply; 19+ messages in thread From: Daniel Vetter @ 2018-10-22 14:59 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: IGT development, Petri Latvala, Daniel Vetter On Mon, Oct 22, 2018 at 05:38:44PM +0300, Arkadiusz Hiler wrote: > On Mon, Oct 22, 2018 at 04:25:50PM +0200, Daniel Vetter wrote: > > On Mon, Oct 22, 2018 at 4:24 PM Arkadiusz Hiler > > <arkadiusz.hiler@intel.com> wrote: > > > > > > On Mon, Oct 22, 2018 at 04:18:56PM +0200, Daniel Vetter wrote: > > > > On Mon, Oct 22, 2018 at 4:15 PM Arkadiusz Hiler > > > > <arkadiusz.hiler@intel.com> wrote: > > > > > > > > > > On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > > > > > > The CI/CD pipeline is configured the following way: > > > > > > 1. Build docker images and add them to repo's registry (manual step for > > > > > > now, automation needs GitLab to be updated). > > > > > > 2. Build igt with meson on Debian and Fedora. > > > > > > 3. Run `ninja tests` on Fedora. > > > > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > > > > > > > v2: Typos and fully-featured meson build. > > > > > > > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > > > > > > > > Both images are already in our registry. > > > > > > > > > > Here you can see the pipline running (on a testing branch): > > > > > https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 > > > > > > > > I think the "proper" gitlab way of doing this is not through a > > > > temporary branch, but through a merge request. Or a personal fork. > > > > Gives you the exact same amount of gitlab-ci testing as a branch. Just > > > > an aside, figure we'll start with the process bikeshedding right away > > > > :-) > > > > -Daniel > > > > > > I was playing with that on my fork, but the issue was that I would have > > > to change the paths to registry each time I send a patch and push it to > > > my repo. Too annoying, so I went with a temporary branch. > > > > If you do an MR, does it work better? > > -Daniel > > They are disabled for IGT, which kind of makes sense, as we do not take > contributions that way (yet?) - there's no proper CI for MRs. Huh, I guess that was Daniel Stone's doing. I think there's some sense in having issues disabled, but imo merge requests we can leave enabled. Much, much easier for test-driving gitlab process issues this way. Ofc anyone who submits as MR only will get redirect to the m-l. Ack if we just enable them again? -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-22 14:59 ` Daniel Vetter @ 2018-10-23 7:32 ` Arkadiusz Hiler 2018-10-23 13:30 ` Daniel Vetter 0 siblings, 1 reply; 19+ messages in thread From: Arkadiusz Hiler @ 2018-10-23 7:32 UTC (permalink / raw) To: Daniel Vetter; +Cc: IGT development, Petri Latvala On Mon, Oct 22, 2018 at 04:59:36PM +0200, Daniel Vetter wrote: > On Mon, Oct 22, 2018 at 05:38:44PM +0300, Arkadiusz Hiler wrote: > > On Mon, Oct 22, 2018 at 04:25:50PM +0200, Daniel Vetter wrote: > > > On Mon, Oct 22, 2018 at 4:24 PM Arkadiusz Hiler > > > <arkadiusz.hiler@intel.com> wrote: > > > > > > > > On Mon, Oct 22, 2018 at 04:18:56PM +0200, Daniel Vetter wrote: > > > > > On Mon, Oct 22, 2018 at 4:15 PM Arkadiusz Hiler > > > > > <arkadiusz.hiler@intel.com> wrote: > > > > > > > > > > > > On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > > > > > > > The CI/CD pipeline is configured the following way: > > > > > > > 1. Build docker images and add them to repo's registry (manual step for > > > > > > > now, automation needs GitLab to be updated). > > > > > > > 2. Build igt with meson on Debian and Fedora. > > > > > > > 3. Run `ninja tests` on Fedora. > > > > > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > > > > > > > > > v2: Typos and fully-featured meson build. > > > > > > > > > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > > > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > > > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > > > > > > > > > > Both images are already in our registry. > > > > > > > > > > > > Here you can see the pipline running (on a testing branch): > > > > > > https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 > > > > > > > > > > I think the "proper" gitlab way of doing this is not through a > > > > > temporary branch, but through a merge request. Or a personal fork. > > > > > Gives you the exact same amount of gitlab-ci testing as a branch. Just > > > > > an aside, figure we'll start with the process bikeshedding right away > > > > > :-) > > > > > -Daniel > > > > > > > > I was playing with that on my fork, but the issue was that I would have > > > > to change the paths to registry each time I send a patch and push it to > > > > my repo. Too annoying, so I went with a temporary branch. > > > > > > If you do an MR, does it work better? > > > -Daniel > > > > They are disabled for IGT, which kind of makes sense, as we do not take > > contributions that way (yet?) - there's no proper CI for MRs. > > Huh, I guess that was Daniel Stone's doing. I think there's some sense in > having issues disabled, but imo merge requests we can leave enabled. Much, > much easier for test-driving gitlab process issues this way. > > Ofc anyone who submits as MR only will get redirect to the m-l. > > Ack if we just enable them again? > -Daniel I don't like to misguide people. If we don't take contributions this way it just feels wrong to me to have MRs available in the UI. IMO without the MRs enabled, people are much more likely to read CONTRIBUTING and do the right thing the first time, without unnecessary latency and additional annoyance. As of testing CI: https://gitlab.freedesktop.org/ivyl/igt/commit/930189231a86 script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian -f Dockerfile.debian . - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian This makes it repository agnostic. -Arek _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-23 7:32 ` Arkadiusz Hiler @ 2018-10-23 13:30 ` Daniel Vetter 2018-10-24 16:27 ` Arkadiusz Hiler 0 siblings, 1 reply; 19+ messages in thread From: Daniel Vetter @ 2018-10-23 13:30 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: IGT development, Petri Latvala, Daniel Vetter On Tue, Oct 23, 2018 at 10:32:31AM +0300, Arkadiusz Hiler wrote: > On Mon, Oct 22, 2018 at 04:59:36PM +0200, Daniel Vetter wrote: > > On Mon, Oct 22, 2018 at 05:38:44PM +0300, Arkadiusz Hiler wrote: > > > On Mon, Oct 22, 2018 at 04:25:50PM +0200, Daniel Vetter wrote: > > > > On Mon, Oct 22, 2018 at 4:24 PM Arkadiusz Hiler > > > > <arkadiusz.hiler@intel.com> wrote: > > > > > > > > > > On Mon, Oct 22, 2018 at 04:18:56PM +0200, Daniel Vetter wrote: > > > > > > On Mon, Oct 22, 2018 at 4:15 PM Arkadiusz Hiler > > > > > > <arkadiusz.hiler@intel.com> wrote: > > > > > > > > > > > > > > On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > > > > > > > > The CI/CD pipeline is configured the following way: > > > > > > > > 1. Build docker images and add them to repo's registry (manual step for > > > > > > > > now, automation needs GitLab to be updated). > > > > > > > > 2. Build igt with meson on Debian and Fedora. > > > > > > > > 3. Run `ninja tests` on Fedora. > > > > > > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > > > > > > > > > > > v2: Typos and fully-featured meson build. > > > > > > > > > > > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > > > > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > > > > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > > > > > > > > > > > > Both images are already in our registry. > > > > > > > > > > > > > > Here you can see the pipline running (on a testing branch): > > > > > > > https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 > > > > > > > > > > > > I think the "proper" gitlab way of doing this is not through a > > > > > > temporary branch, but through a merge request. Or a personal fork. > > > > > > Gives you the exact same amount of gitlab-ci testing as a branch. Just > > > > > > an aside, figure we'll start with the process bikeshedding right away > > > > > > :-) > > > > > > -Daniel > > > > > > > > > > I was playing with that on my fork, but the issue was that I would have > > > > > to change the paths to registry each time I send a patch and push it to > > > > > my repo. Too annoying, so I went with a temporary branch. > > > > > > > > If you do an MR, does it work better? > > > > -Daniel > > > > > > They are disabled for IGT, which kind of makes sense, as we do not take > > > contributions that way (yet?) - there's no proper CI for MRs. > > > > Huh, I guess that was Daniel Stone's doing. I think there's some sense in > > having issues disabled, but imo merge requests we can leave enabled. Much, > > much easier for test-driving gitlab process issues this way. > > > > Ofc anyone who submits as MR only will get redirect to the m-l. > > > > Ack if we just enable them again? > > -Daniel > > I don't like to misguide people. If we don't take contributions this way it > just feels wrong to me to have MRs available in the UI. > > IMO without the MRs enabled, people are much more likely to read CONTRIBUTING > and do the right thing the first time, without unnecessary latency and > additional annoyance. We can enable MR just for project members. I think that would avoid the confusion? I do kinda want to enable them, for experimenting. Ofc can do that all with my private fork, but not e.g. for how to integrate intel-gfx-CI. -Daniel > As of testing CI: > https://gitlab.freedesktop.org/ivyl/igt/commit/930189231a86 > script: > - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY > - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian -f Dockerfile.debian . > - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian > > This makes it repository agnostic. > -Arek -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] Add GitLab's CI/CD configuration 2018-10-23 13:30 ` Daniel Vetter @ 2018-10-24 16:27 ` Arkadiusz Hiler 0 siblings, 0 replies; 19+ messages in thread From: Arkadiusz Hiler @ 2018-10-24 16:27 UTC (permalink / raw) To: Daniel Vetter; +Cc: IGT development, Petri Latvala On Tue, Oct 23, 2018 at 03:30:36PM +0200, Daniel Vetter wrote: > On Tue, Oct 23, 2018 at 10:32:31AM +0300, Arkadiusz Hiler wrote: > > On Mon, Oct 22, 2018 at 04:59:36PM +0200, Daniel Vetter wrote: > > > On Mon, Oct 22, 2018 at 05:38:44PM +0300, Arkadiusz Hiler wrote: > > > > On Mon, Oct 22, 2018 at 04:25:50PM +0200, Daniel Vetter wrote: > > > > > On Mon, Oct 22, 2018 at 4:24 PM Arkadiusz Hiler > > > > > <arkadiusz.hiler@intel.com> wrote: > > > > > > > > > > > > On Mon, Oct 22, 2018 at 04:18:56PM +0200, Daniel Vetter wrote: > > > > > > > On Mon, Oct 22, 2018 at 4:15 PM Arkadiusz Hiler > > > > > > > <arkadiusz.hiler@intel.com> wrote: > > > > > > > > > > > > > > > > On Mon, Oct 22, 2018 at 03:09:04PM +0300, Arkadiusz Hiler wrote: > > > > > > > > > The CI/CD pipeline is configured the following way: > > > > > > > > > 1. Build docker images and add them to repo's registry (manual step for > > > > > > > > > now, automation needs GitLab to be updated). > > > > > > > > > 2. Build igt with meson on Debian and Fedora. > > > > > > > > > 3. Run `ninja tests` on Fedora. > > > > > > > > > 4. Build and publish docs as an artifact, for GitLab Pages. > > > > > > > > > > > > > > > > > > v2: Typos and fully-featured meson build. > > > > > > > > > > > > > > > > > > Cc: Petri Latvala <petri.latvala@intel.com> > > > > > > > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > > > > > > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > > > > > > > > > > > > > > > > Both images are already in our registry. > > > > > > > > > > > > > > > > Here you can see the pipline running (on a testing branch): > > > > > > > > https://gitlab.freedesktop.org/drm/igt-gpu-tools/pipelines/6292 > > > > > > > > > > > > > > I think the "proper" gitlab way of doing this is not through a > > > > > > > temporary branch, but through a merge request. Or a personal fork. > > > > > > > Gives you the exact same amount of gitlab-ci testing as a branch. Just > > > > > > > an aside, figure we'll start with the process bikeshedding right away > > > > > > > :-) > > > > > > > -Daniel > > > > > > > > > > > > I was playing with that on my fork, but the issue was that I would have > > > > > > to change the paths to registry each time I send a patch and push it to > > > > > > my repo. Too annoying, so I went with a temporary branch. > > > > > > > > > > If you do an MR, does it work better? > > > > > -Daniel > > > > > > > > They are disabled for IGT, which kind of makes sense, as we do not take > > > > contributions that way (yet?) - there's no proper CI for MRs. > > > > > > Huh, I guess that was Daniel Stone's doing. I think there's some sense in > > > having issues disabled, but imo merge requests we can leave enabled. Much, > > > much easier for test-driving gitlab process issues this way. > > > > > > Ofc anyone who submits as MR only will get redirect to the m-l. > > > > > > Ack if we just enable them again? > > > -Daniel > > > > I don't like to misguide people. If we don't take contributions this way it > > just feels wrong to me to have MRs available in the UI. > > > > IMO without the MRs enabled, people are much more likely to read CONTRIBUTING > > and do the right thing the first time, without unnecessary latency and > > additional annoyance. > > We can enable MR just for project members. I think that would avoid the > confusion? I do kinda want to enable them, for experimenting. Ofc can do > that all with my private fork, but not e.g. for how to integrate > intel-gfx-CI. > -Daniel I am still not convinced that the UI/notification noise is worth the doubtable benefits. Even if you turn it just for the project members, the tab in the UI will appear for everyone. I am fine with turning the MRs on, when we are on the verge of actually enabling this way of contributing, for the last stage of testing intel-gfx-ci integration. Meanwhile, we can be as noisy as we want with our testing on forks. -- Cheers, Arek _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for Add GitLab's CI/CD configuration (rev2) 2018-10-22 8:42 [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration Arkadiusz Hiler ` (3 preceding siblings ...) 2018-10-22 12:09 ` [igt-dev] [PATCH i-g-t v2] " Arkadiusz Hiler @ 2018-10-22 20:43 ` Patchwork 2018-10-22 22:33 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 5 siblings, 0 replies; 19+ messages in thread From: Patchwork @ 2018-10-22 20:43 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: igt-dev == Series Details == Series: Add GitLab's CI/CD configuration (rev2) URL : https://patchwork.freedesktop.org/series/51318/ State : success == Summary == = CI Bug Log - changes from CI_DRM_5013 -> IGTPW_1971 = == Summary - SUCCESS == No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/51318/revisions/2/mbox/ == Known issues == Here are the changes found in IGTPW_1971 that come from known issues: === IGT changes === ==== Issues hit ==== igt@gem_exec_store@basic-bsd: fi-icl-u: NOTRUN -> DMESG-WARN (fdo#107732) +5 igt@gem_exec_suspend@basic: fi-icl-u: NOTRUN -> DMESG-WARN (fdo#107724) +26 igt@gem_exec_suspend@basic-s3: fi-kbl-soraka: NOTRUN -> INCOMPLETE (fdo#107859, fdo#107774, fdo#107556) fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718) fi-icl-u: NOTRUN -> DMESG-WARN (fdo#108512) igt@kms_flip@basic-flip-vs-modeset: fi-skl-6700hq: PASS -> DMESG-WARN (fdo#105998) +1 igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a: fi-byt-clapper: PASS -> FAIL (fdo#103191, fdo#107362) ==== Possible fixes ==== igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b: fi-byt-clapper: FAIL (fdo#107362) -> PASS fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191 fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998 fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362 fdo#107556 https://bugs.freedesktop.org/show_bug.cgi?id=107556 fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718 fdo#107724 https://bugs.freedesktop.org/show_bug.cgi?id=107724 fdo#107732 https://bugs.freedesktop.org/show_bug.cgi?id=107732 fdo#107774 https://bugs.freedesktop.org/show_bug.cgi?id=107774 fdo#107859 https://bugs.freedesktop.org/show_bug.cgi?id=107859 fdo#108512 https://bugs.freedesktop.org/show_bug.cgi?id=108512 == Participating hosts (41 -> 46) == Additional (10): fi-kbl-soraka fi-skl-guc fi-bdw-gvtdvm fi-glk-dsi fi-gdg-551 fi-pnv-d510 fi-ivb-3520m fi-icl-u fi-byt-n2820 fi-snb-2600 Missing (5): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-icl-u2 fi-ivb-3770 == Build changes == * IGT: IGT_4684 -> IGTPW_1971 CI_DRM_5013: 0008b23799728680da3d6d871d46f746a3f69c35 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_1971: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1971/ IGT_4684: 6f27fddc6dd79c0486181b64201c6773c5c42a24 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1971/issues.html _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for Add GitLab's CI/CD configuration (rev2) 2018-10-22 8:42 [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration Arkadiusz Hiler ` (4 preceding siblings ...) 2018-10-22 20:43 ` [igt-dev] ✓ Fi.CI.BAT: success for Add GitLab's CI/CD configuration (rev2) Patchwork @ 2018-10-22 22:33 ` Patchwork 5 siblings, 0 replies; 19+ messages in thread From: Patchwork @ 2018-10-22 22:33 UTC (permalink / raw) To: Arkadiusz Hiler; +Cc: igt-dev == Series Details == Series: Add GitLab's CI/CD configuration (rev2) URL : https://patchwork.freedesktop.org/series/51318/ State : success == Summary == = CI Bug Log - changes from IGT_4684_full -> IGTPW_1971_full = == Summary - WARNING == Minor unknown changes coming with IGTPW_1971_full need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in IGTPW_1971_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. External URL: https://patchwork.freedesktop.org/api/1.0/series/51318/revisions/2/mbox/ == Possible new issues == Here are the unknown changes that may have been introduced in IGTPW_1971_full: === IGT changes === ==== Warnings ==== igt@pm_rc6_residency@rc6-accuracy: shard-kbl: PASS -> SKIP == Known issues == Here are the changes found in IGTPW_1971_full that come from known issues: === IGT changes === ==== Issues hit ==== igt@kms_available_modes_crc@available_mode_test_crc: shard-hsw: NOTRUN -> FAIL (fdo#106641) igt@kms_busy@extended-modeset-hang-newfb-render-c: shard-glk: NOTRUN -> DMESG-WARN (fdo#107956) +1 shard-hsw: NOTRUN -> DMESG-WARN (fdo#107956) +1 shard-kbl: NOTRUN -> DMESG-WARN (fdo#107956) +1 igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a: shard-snb: NOTRUN -> DMESG-WARN (fdo#107956) igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c: shard-apl: NOTRUN -> DMESG-WARN (fdo#107956) +1 igt@kms_ccs@pipe-a-crc-sprite-planes-basic: shard-glk: PASS -> FAIL (fdo#108145) +1 igt@kms_cursor_crc@cursor-128x128-dpms: shard-kbl: PASS -> FAIL (fdo#103232) igt@kms_cursor_crc@cursor-256x85-random: shard-glk: PASS -> FAIL (fdo#103232) +2 igt@kms_cursor_crc@cursor-64x64-dpms: shard-apl: PASS -> FAIL (fdo#103232) +3 igt@kms_cursor_crc@cursor-size-change: shard-apl: NOTRUN -> FAIL (fdo#103232) igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt: shard-apl: PASS -> FAIL (fdo#103167) igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-gtt: shard-glk: PASS -> FAIL (fdo#103167) +3 igt@kms_plane_alpha_blend@pipe-b-coverage-7efc: shard-apl: NOTRUN -> FAIL (fdo#108146) shard-kbl: NOTRUN -> FAIL (fdo#108146) igt@kms_plane_multiple@atomic-pipe-a-tiling-y: shard-apl: NOTRUN -> FAIL (fdo#103166) +1 igt@kms_plane_multiple@atomic-pipe-c-tiling-yf: shard-apl: PASS -> FAIL (fdo#103166) shard-glk: PASS -> FAIL (fdo#103166) igt@kms_setmode@basic: shard-snb: NOTRUN -> FAIL (fdo#99912) igt@syncobj_wait@wait-all-for-submit-delayed-submit: shard-glk: NOTRUN -> INCOMPLETE (fdo#103359, k.org#198133) ==== Possible fixes ==== igt@kms_color@pipe-c-degamma: shard-apl: FAIL (fdo#104782) -> PASS igt@kms_cursor_crc@cursor-128x42-sliding: shard-glk: FAIL (fdo#103232) -> PASS +2 igt@kms_cursor_crc@cursor-256x256-suspend: shard-kbl: FAIL (fdo#103232, fdo#103191) -> PASS shard-apl: FAIL (fdo#103232, fdo#103191) -> PASS igt@kms_cursor_crc@cursor-256x85-random: shard-apl: FAIL (fdo#103232) -> PASS +1 igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-onoff: shard-glk: FAIL (fdo#103167) -> PASS +1 igt@kms_plane@plane-position-covered-pipe-a-planes: shard-glk: FAIL (fdo#103166) -> PASS +3 igt@kms_plane_multiple@atomic-pipe-a-tiling-x: shard-apl: FAIL (fdo#103166) -> PASS fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166 fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167 fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191 fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232 fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359 fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782 fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641 fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956 fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145 fdo#108146 https://bugs.freedesktop.org/show_bug.cgi?id=108146 fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912 k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133 == Participating hosts (6 -> 5) == Missing (1): shard-skl == Build changes == * IGT: IGT_4684 -> IGTPW_1971 * Linux: CI_DRM_5010 -> CI_DRM_5013 CI_DRM_5010: 27a4f334d3ec8882d50227c26ae4e393d7d1f4a1 @ git://anongit.freedesktop.org/gfx-ci/linux CI_DRM_5013: 0008b23799728680da3d6d871d46f746a3f69c35 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_1971: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1971/ IGT_4684: 6f27fddc6dd79c0486181b64201c6773c5c42a24 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1971/shards.html _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2018-10-24 16:28 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-10-22 8:42 [igt-dev] [PATCH i-g-t] Add GitLab's CI/CD configuration Arkadiusz Hiler 2018-10-22 9:03 ` Petri Latvala 2018-10-22 9:22 ` Daniel Vetter 2018-10-22 9:58 ` Arkadiusz Hiler 2018-10-22 14:16 ` Daniel Vetter 2018-10-22 14:31 ` Arkadiusz Hiler 2018-10-22 9:47 ` Saarinen, Jani 2018-10-22 12:09 ` [igt-dev] [PATCH i-g-t v2] " Arkadiusz Hiler 2018-10-22 14:14 ` Arkadiusz Hiler 2018-10-22 14:18 ` Daniel Vetter 2018-10-22 14:24 ` Arkadiusz Hiler 2018-10-22 14:25 ` Daniel Vetter 2018-10-22 14:38 ` Arkadiusz Hiler 2018-10-22 14:59 ` Daniel Vetter 2018-10-23 7:32 ` Arkadiusz Hiler 2018-10-23 13:30 ` Daniel Vetter 2018-10-24 16:27 ` Arkadiusz Hiler 2018-10-22 20:43 ` [igt-dev] ✓ Fi.CI.BAT: success for Add GitLab's CI/CD configuration (rev2) Patchwork 2018-10-22 22:33 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox