[igt-dev] Add containers with IGT inside

[igt-dev] Add containers with IGT inside

[Oleg Vasilev]

There is an example run of the new pipeline [1].
The suggestions to replace the term "final containers" are welcomed.

CC: Petri Latvala <petri.latvala@intel.com>
CC: Arkadiusz Hiler <arkadiusz.hiler@intel.com>

[1] https://gitlab.freedesktop.org/omrigan/igt-gpu-tools/commit/0362e97d00df849528d731aea4952538a180eec3


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

[igt-dev] [PATCH v2 1/3] gitlab-ci: move containers section to the up

[Oleg Vasilev]

No functional changes. This order is consistent with the order of
execution stages.

Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
 .gitlab-ci.yml | 179 +++++++++++++++++++++++++------------------------
 1 file changed, 90 insertions(+), 89 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ed538a4..d47c9514 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,96 @@ stages:
   - test
   - deploy
 
+################# CONTAINERS #######################
+
+containers:igt-debian:
+  stage: containers
+  image: docker:stable
+  only:
+    changes:
+      - Dockerfile.debian-minimal
+      - Dockerfile.debian
+      - .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 -t igt-debian-minimal -f Dockerfile.debian-minimal .
+    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian -f Dockerfile.debian .
+    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal
+    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian
+
+containers:igt-debian-armhf:
+  stage: containers
+  image: docker:stable
+  only:
+    changes:
+      - Dockerfile.debian-armhf
+      - .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-armhf -f Dockerfile.debian-armhf .
+    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-armhf
+
+containers:igt-debian-arm64:
+  stage: containers
+  image: docker:stable
+  only:
+    changes:
+      - Dockerfile.debian-arm64
+      - .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-arm64 -f Dockerfile.debian-arm64 .
+    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-arm64
+
+containers:igt-debian-mips:
+  stage: containers
+  image: docker:stable
+  only:
+    changes:
+      - Dockerfile.debian-mips
+      - .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-mips -f Dockerfile.debian-mips .
+    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-mips
+
+containers:igt-fedora:
+  stage: containers
+  image: docker:stable
+  only:
+    changes:
+      - Dockerfile.fedora
+      - .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-fedora -f Dockerfile.fedora .
+    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora
+
 #################### BUILD #########################
 
 build:tests-fedora:
@@ -210,92 +300,3 @@ pages:
   only:
     - master
 
-################# CONTAINERS #######################
-
-containers:igt-debian:
-  stage: containers
-  image: docker:stable
-  only:
-    changes:
-      - Dockerfile.debian-minimal
-      - Dockerfile.debian
-      - .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 -t igt-debian-minimal -f Dockerfile.debian-minimal .
-    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian -f Dockerfile.debian .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian
-
-containers:igt-debian-armhf:
-  stage: containers
-  image: docker:stable
-  only:
-    changes:
-      - Dockerfile.debian-armhf
-      - .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-armhf -f Dockerfile.debian-armhf .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-armhf
-
-containers:igt-debian-arm64:
-  stage: containers
-  image: docker:stable
-  only:
-    changes:
-      - Dockerfile.debian-arm64
-      - .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-arm64 -f Dockerfile.debian-arm64 .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-arm64
-
-containers:igt-debian-mips:
-  stage: containers
-  image: docker:stable
-  only:
-    changes:
-      - Dockerfile.debian-mips
-      - .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-mips -f Dockerfile.debian-mips .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-mips
-
-containers:igt-fedora:
-  stage: containers
-  image: docker:stable
-  only:
-    changes:
-      - Dockerfile.fedora
-      - .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-fedora -f Dockerfile.fedora .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora
-- 
2.22.0

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

[igt-dev] [PATCH v2 2/3] gitlab-ci: rebuild images only on Dockerfile changes

[Oleg Vasilev]

Base images rarely change, there is not much sense in rebuilding it on
every commit. GitLab already has mechanism for detecting such changes.
However, it is only able to prevent rebuilding whenever there is no
changes within the same ref. Since in our CI system, git tag is created
on every series, the mechanism doesn't work.

One possible way to workaround that is to compute a checksum of a
Dockerfile, and rebuilding only if there was no image built with the
same checksum.

Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
 .gitlab-ci.yml             | 39 +++++------------------------
 scripts/pull-or-rebuild.sh | 50 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100755 scripts/pull-or-rebuild.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d47c9514..c9f8ca35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,11 +22,6 @@ stages:
 containers:igt-debian:
   stage: containers
   image: docker:stable
-  only:
-    changes:
-      - Dockerfile.debian-minimal
-      - Dockerfile.debian
-      - .gitlab-ci.yml
   services:
     - docker:dind
   variables:
@@ -34,18 +29,12 @@ containers:igt-debian:
     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 -t igt-debian-minimal -f Dockerfile.debian-minimal .
-    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian -f Dockerfile.debian .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian
+    - scripts/pull-or-rebuild.sh Dockerfile.debian-minimal igt-debian-minimal
+    - scripts/pull-or-rebuild.sh Dockerfile.debian igt-debian
 
 containers:igt-debian-armhf:
   stage: containers
   image: docker:stable
-  only:
-    changes:
-      - Dockerfile.debian-armhf
-      - .gitlab-ci.yml
   services:
     - docker:dind
   variables:
@@ -53,16 +42,11 @@ containers:igt-debian-armhf:
     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-armhf -f Dockerfile.debian-armhf .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-armhf
+    - scripts/pull-or-rebuild.sh Dockerfile.debian-armhf igt-debian-armhf
 
 containers:igt-debian-arm64:
   stage: containers
   image: docker:stable
-  only:
-    changes:
-      - Dockerfile.debian-arm64
-      - .gitlab-ci.yml
   services:
     - docker:dind
   variables:
@@ -70,16 +54,11 @@ containers:igt-debian-arm64:
     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-arm64 -f Dockerfile.debian-arm64 .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-arm64
+    - scripts/pull-or-rebuild.sh Dockerfile.debian-arm64 igt-debian-arm64
 
 containers:igt-debian-mips:
   stage: containers
   image: docker:stable
-  only:
-    changes:
-      - Dockerfile.debian-mips
-      - .gitlab-ci.yml
   services:
     - docker:dind
   variables:
@@ -87,16 +66,11 @@ containers:igt-debian-mips:
     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-mips -f Dockerfile.debian-mips .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-mips
+    - scripts/pull-or-rebuild.sh Dockerfile.debian-mips igt-debian-mips
 
 containers:igt-fedora:
   stage: containers
   image: docker:stable
-  only:
-    changes:
-      - Dockerfile.fedora
-      - .gitlab-ci.yml
   services:
     - docker:dind
   variables:
@@ -104,8 +78,7 @@ containers:igt-fedora:
     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-fedora -f Dockerfile.fedora .
-    - docker push $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora
+    - scripts/pull-or-rebuild.sh Dockerfile.fedora igt-fedora
 
 #################### BUILD #########################
 
diff --git a/scripts/pull-or-rebuild.sh b/scripts/pull-or-rebuild.sh
new file mode 100755
index 00000000..8ad32696
--- /dev/null
+++ b/scripts/pull-or-rebuild.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+DOCKERFILE=$1
+NAME=$2
+TAG=${3:-${CI_COMMIT_REF_NAME:-latest}}
+
+TAG=$(echo $TAG | tr / - )
+if [ $TAG = "master" ]; then
+	TAG=latest
+fi
+
+CHECKSUM=$(sha1sum $DOCKERFILE | cut -d ' ' -f1)
+FULLNAME=$CI_REGISTRY/$CI_PROJECT_PATH/$NAME:$TAG
+CHECKNAME=$CI_REGISTRY/$CI_PROJECT_PATH/$NAME:$CHECKSUM
+
+docker pull $CHECKNAME
+IMAGE_PRESENT=$?
+
+set -e
+if [ $IMAGE_PRESENT -eq 0 ] && [ ${FORCE_REBUILD:-0} -eq 0 ] ; then
+	echo "Skipping $NAME:$TAG, already built"
+	docker tag $CHECKNAME $FULLNAME
+	docker tag $CHECKNAME $NAME
+else
+	echo "Building $NAME:$TAG"
+	docker build -t $CHECKNAME -t $FULLNAME -t $NAME -f $DOCKERFILE .
+	docker push $CHECKNAME
+fi
+docker push $FULLNAME
-- 
2.22.0

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

[igt-dev] [PATCH v2 3/3] gitlab-ci: introduce final containers

[Oleg Vasilev]

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.

Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
 .gitlab-ci.yml         | 25 ++++++++++++++++++++++++-
 Dockerfile.final       | 16 ++++++++++++++++
 scripts/docker-help.sh | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile.final
 create mode 100755 scripts/docker-help.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9f8ca35..109ad7d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ stages:
   - build
   - test
   - deploy
+  - final-containers
 
 ################# CONTAINERS #######################
 
@@ -85,12 +86,15 @@ containers:igt-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
+    - ls opt-igt
   artifacts:
     paths:
       - build
+      - opt-igt
 
 build:tests-fedora-no-libunwind:
   stage: build
@@ -273,3 +277,22 @@ pages:
   only:
     - master
 
+############## FINAL CONTAINERS ####################
+
+
+final-containers:igt-final:
+  stage: final-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/igt-fedora
+    - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora igt-fedora
+    - scripts/pull-or-rebuild.sh Dockerfile.final igt-final
diff --git a/Dockerfile.final b/Dockerfile.final
new file mode 100644
index 00000000..214a5c20
--- /dev/null
+++ b/Dockerfile.final
@@ -0,0 +1,16 @@
+# Version number to bump for force image rebuild: 0
+FROM igt-fedora
+
+RUN dnf install -y findutils && \
+        dnf clean all
+
+COPY opt-igt /opt/igt
+COPY scripts/docker-help.sh /usr/local/bin/docker-help.sh
+
+ENV PATH="/opt/igt/bin:${PATH}"
+ENV LD_LIBRARY_PATH="/opt/igt/lib:/opt/igt/lib64:${LD_LIBRARY_PATH}"
+ENV IGT_TEST_ROOT="/opt/igt/libexec/igt-gpu-tools"
+
+COPY scripts/docker-help.sh /usr/local/bin/docker-help.sh
+
+CMD docker-help.sh
diff --git a/scripts/docker-help.sh b/scripts/docker-help.sh
new file mode 100755
index 00000000..671da137
--- /dev/null
+++ b/scripts/docker-help.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+TEST_LIST=$(find /opt/igt/libexec -type f -printf "%f ")
+cat << END
+This is a docker container, packaged with intel-gpu-tools.
+ - IGT runner is available in PATH. In order for results to be available on a
+   host system, the directory has to be mounted inside, e.g.
+     docker run -v results:/tmp/results igt-final igt_runner /tmp/results
+ - Test lists are available in /opt/igt/share/igt-gpu-tools
+ - Test binaries are available in IGT_TEST_ROOT=/opt/igt/libexec.
+
+Contents of /opt/igt/libexec: $TEST_LIST
+END
-- 
2.22.0

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

[igt-dev] ✓ Fi.CI.BAT: success for series starting with [v2,1/3] gitlab-ci: move containers section to the up

[Patchwork]

== Series Details ==

Series: series starting with [v2,1/3] gitlab-ci: move containers section to the up
URL   : https://patchwork.freedesktop.org/series/65480/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6745 -> IGTPW_3368
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/65480/revisions/1/mbox/

Known issues
------------

  Here are the changes found in IGTPW_3368 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_switch@legacy-render:
    - fi-bxt-dsi:         [PASS][1] -> [INCOMPLETE][2] ([fdo#103927])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html

  * igt@kms_frontbuffer_tracking@basic:
    - fi-icl-u2:          [PASS][3] -> [FAIL][4] ([fdo#103167])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html

  
#### Possible fixes ####

  * igt@gem_sync@basic-store-each:
    - fi-cfl-8109u:       [INCOMPLETE][5] ([fdo#111427]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/fi-cfl-8109u/igt@gem_sync@basic-store-each.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/fi-cfl-8109u/igt@gem_sync@basic-store-each.html

  * {igt@i915_selftest@live_gt_timelines}:
    - fi-bsw-kefka:       [DMESG-WARN][7] ([fdo#111373]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/fi-bsw-kefka/igt@i915_selftest@live_gt_timelines.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/fi-bsw-kefka/igt@i915_selftest@live_gt_timelines.html

  * igt@kms_busy@basic-flip-a:
    - fi-kbl-7567u:       [SKIP][9] ([fdo#109271] / [fdo#109278]) -> [PASS][10] +2 similar issues
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/fi-kbl-7567u/igt@kms_busy@basic-flip-a.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/fi-kbl-7567u/igt@kms_busy@basic-flip-a.html

  * igt@kms_frontbuffer_tracking@basic:
    - fi-hsw-peppy:       [DMESG-WARN][11] ([fdo#102614]) -> [PASS][12]
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#111373]: https://bugs.freedesktop.org/show_bug.cgi?id=111373
  [fdo#111427]: https://bugs.freedesktop.org/show_bug.cgi?id=111427


Participating hosts (56 -> 47)
------------------------------

  Missing    (9): fi-kbl-soraka fi-ilk-m540 fi-tgl-u fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus 


Build changes
-------------

  * CI: CI-20190529 -> None
  * IGT: IGT_5145 -> IGTPW_3368

  CI-20190529: 20190529
  CI_DRM_6745: 001f02411223cb625aed43fbed5c1bbcecc447f7 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3368: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/
  IGT_5145: 50251bcb2e8783f86ebdd86ce38adc9e3777f82f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.IGT: success for series starting with [v2,1/3] gitlab-ci: move containers section to the up

[Patchwork]

== Series Details ==

Series: series starting with [v2,1/3] gitlab-ci: move containers section to the up
URL   : https://patchwork.freedesktop.org/series/65480/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6745_full -> IGTPW_3368_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/65480/revisions/1/mbox/

Known issues
------------

  Here are the changes found in IGTPW_3368_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_eio@in-flight-suspend:
    - shard-snb:          [PASS][1] -> [INCOMPLETE][2] ([fdo#105411]) +1 similar issue
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-snb2/igt@gem_eio@in-flight-suspend.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-snb6/igt@gem_eio@in-flight-suspend.html

  * igt@gem_eio@reset-stress:
    - shard-kbl:          [PASS][3] -> [FAIL][4] ([fdo#109661])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-kbl4/igt@gem_eio@reset-stress.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-kbl4/igt@gem_eio@reset-stress.html

  * igt@gem_exec_balancer@smoke:
    - shard-iclb:         [PASS][5] -> [SKIP][6] ([fdo#110854])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb4/igt@gem_exec_balancer@smoke.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb8/igt@gem_exec_balancer@smoke.html

  * igt@gem_exec_schedule@preempt-bsd1:
    - shard-iclb:         [PASS][7] -> [SKIP][8] ([fdo#109276]) +17 similar issues
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb1/igt@gem_exec_schedule@preempt-bsd1.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb8/igt@gem_exec_schedule@preempt-bsd1.html

  * igt@gem_exec_schedule@preempt-other-chain-bsd:
    - shard-iclb:         [PASS][9] -> [SKIP][10] ([fdo#111325]) +5 similar issues
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb8/igt@gem_exec_schedule@preempt-other-chain-bsd.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb4/igt@gem_exec_schedule@preempt-other-chain-bsd.html

  * igt@i915_suspend@fence-restore-untiled:
    - shard-apl:          [PASS][11] -> [DMESG-WARN][12] ([fdo#108566]) +4 similar issues
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-apl4/igt@i915_suspend@fence-restore-untiled.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-apl8/igt@i915_suspend@fence-restore-untiled.html

  * igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen:
    - shard-apl:          [PASS][13] -> [INCOMPLETE][14] ([fdo#103927])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-apl2/igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-apl2/igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
    - shard-apl:          [PASS][15] -> [FAIL][16] ([fdo#103167])
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-apl4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-apl7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen.html
    - shard-kbl:          [PASS][17] -> [FAIL][18] ([fdo#103167])
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-pwrite:
    - shard-iclb:         [PASS][19] -> [FAIL][20] ([fdo#103167]) +6 similar issues
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-pwrite.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-pwrite.html

  * igt@kms_psr@psr2_cursor_render:
    - shard-iclb:         [PASS][21] -> [SKIP][22] ([fdo#109441]) +2 similar issues
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb4/igt@kms_psr@psr2_cursor_render.html

  * igt@tools_test@sysfs_l3_parity:
    - shard-hsw:          [PASS][23] -> [SKIP][24] ([fdo#109271])
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-hsw6/igt@tools_test@sysfs_l3_parity.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-hsw2/igt@tools_test@sysfs_l3_parity.html

  
#### Possible fixes ####

  * igt@gem_exec_schedule@independent-bsd1:
    - shard-iclb:         [SKIP][25] ([fdo#109276]) -> [PASS][26] +17 similar issues
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb3/igt@gem_exec_schedule@independent-bsd1.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb4/igt@gem_exec_schedule@independent-bsd1.html

  * igt@gem_exec_schedule@reorder-wide-bsd:
    - shard-iclb:         [SKIP][27] ([fdo#111325]) -> [PASS][28] +1 similar issue
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb1/igt@gem_exec_schedule@reorder-wide-bsd.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb7/igt@gem_exec_schedule@reorder-wide-bsd.html

  * igt@gem_tiled_swapping@non-threaded:
    - shard-hsw:          [FAIL][29] ([fdo#108686]) -> [PASS][30]
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-hsw2/igt@gem_tiled_swapping@non-threaded.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-hsw5/igt@gem_tiled_swapping@non-threaded.html

  * igt@kms_frontbuffer_tracking@fbc-stridechange:
    - shard-iclb:         [FAIL][31] ([fdo#103167]) -> [PASS][32] +4 similar issues
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-stridechange.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-stridechange.html

  * igt@kms_plane@pixel-format-pipe-c-planes-source-clamping:
    - shard-iclb:         [INCOMPLETE][33] ([fdo#107713] / [fdo#110036 ]) -> [PASS][34]
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb7/igt@kms_plane@pixel-format-pipe-c-planes-source-clamping.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb8/igt@kms_plane@pixel-format-pipe-c-planes-source-clamping.html

  * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
    - shard-apl:          [DMESG-WARN][35] ([fdo#108566]) -> [PASS][36] +4 similar issues
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-apl5/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-apl5/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html

  * igt@kms_psr@psr2_primary_mmap_cpu:
    - shard-iclb:         [SKIP][37] ([fdo#109441]) -> [PASS][38] +1 similar issue
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb5/igt@kms_psr@psr2_primary_mmap_cpu.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html

  
#### Warnings ####

  * igt@gem_mocs_settings@mocs-settings-bsd2:
    - shard-iclb:         [SKIP][39] ([fdo#109276]) -> [FAIL][40] ([fdo#111330]) +1 similar issue
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb3/igt@gem_mocs_settings@mocs-settings-bsd2.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb4/igt@gem_mocs_settings@mocs-settings-bsd2.html

  * igt@kms_dp_dsc@basic-dsc-enable-edp:
    - shard-iclb:         [DMESG-WARN][41] ([fdo#107724]) -> [SKIP][42] ([fdo#109349])
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb3/igt@kms_dp_dsc@basic-dsc-enable-edp.html

  * igt@prime_busy@hang-bsd2:
    - shard-iclb:         [INCOMPLETE][43] ([fdo#107713]) -> [SKIP][44] ([fdo#109276])
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6745/shard-iclb1/igt@prime_busy@hang-bsd2.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/shard-iclb5/igt@prime_busy@hang-bsd2.html

  
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
  [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
  [fdo#110036 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110036 
  [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
  [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
  [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330


Participating hosts (10 -> 6)
------------------------------

  Missing    (4): pig-skl-6260u shard-skl pig-hsw-4770r pig-glk-j5005 


Build changes
-------------

  * CI: CI-20190529 -> None
  * IGT: IGT_5145 -> IGTPW_3368
  * Piglit: piglit_4509 -> None

  CI-20190529: 20190529
  CI_DRM_6745: 001f02411223cb625aed43fbed5c1bbcecc447f7 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3368: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/
  IGT_5145: 50251bcb2e8783f86ebdd86ce38adc9e3777f82f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3368/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH v2 2/3] gitlab-ci: rebuild images only on Dockerfile changes

[Arkadiusz Hiler]

On Tue, Aug 20, 2019 at 04:19:35PM +0300, Oleg Vasilev wrote:
> Base images rarely change, there is not much sense in rebuilding it on
> every commit. GitLab already has mechanism for detecting such changes.
> However, it is only able to prevent rebuilding whenever there is no
> changes within the same ref. Since in our CI system, git tag is created
> on every series, the mechanism doesn't work.
> 
> One possible way to workaround that is to compute a checksum of a
> Dockerfile, and rebuilding only if there was no image built with the
> same checksum.
> 
> Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
> ---
>  .gitlab-ci.yml             | 39 +++++------------------------
>  scripts/pull-or-rebuild.sh | 50 ++++++++++++++++++++++++++++++++++++++

I would hide this helper a bit since it's only for gitlab pipeline.

How about .gitlab-ci/ ?

Other than that:
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>


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

Re: [igt-dev] [PATCH v2 3/3] gitlab-ci: introduce final containers

[Arkadiusz Hiler]

On Tue, Aug 20, 2019 at 04:19:36PM +0300, Oleg Vasilev wrote:
> 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.
> 
> Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
> ---
>  .gitlab-ci.yml         | 25 ++++++++++++++++++++++++-
>  Dockerfile.final       | 16 ++++++++++++++++
>  scripts/docker-help.sh | 34 ++++++++++++++++++++++++++++++++++
>  3 files changed, 74 insertions(+), 1 deletion(-)
>  create mode 100644 Dockerfile.final
>  create mode 100755 scripts/docker-help.sh
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index c9f8ca35..109ad7d0 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -16,6 +16,7 @@ stages:
>    - build
>    - test
>    - deploy
> +  - final-containers
>  
>  ################# CONTAINERS #######################
>  
> @@ -85,12 +86,15 @@ containers:igt-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
> +    - ls opt-igt
>    artifacts:
>      paths:
>        - build
> +      - opt-igt
>  
>  build:tests-fedora-no-libunwind:
>    stage: build
> @@ -273,3 +277,22 @@ pages:
>    only:
>      - master
>  
> +############## FINAL CONTAINERS ####################
> +
> +
> +final-containers:igt-final:

I am sceptical about having it named igt-final.

How about just igt-x86_64?

If you need further clarification on what people should use then you can
add "build-env-" to the name of the *base* images.

> +  stage: final-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/igt-fedora
> +    - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora igt-fedora
> +    - scripts/pull-or-rebuild.sh Dockerfile.final igt-final
> diff --git a/Dockerfile.final b/Dockerfile.final
> new file mode 100644
> index 00000000..214a5c20
> --- /dev/null
> +++ b/Dockerfile.final
> @@ -0,0 +1,16 @@
> +# Version number to bump for force image rebuild: 0
> +FROM igt-fedora
> +
> +RUN dnf install -y findutils && \
> +        dnf clean all
> +
> +COPY opt-igt /opt/igt
> +COPY scripts/docker-help.sh /usr/local/bin/docker-help.sh
> +
> +ENV PATH="/opt/igt/bin:${PATH}"
> +ENV LD_LIBRARY_PATH="/opt/igt/lib:/opt/igt/lib64:${LD_LIBRARY_PATH}"
> +ENV IGT_TEST_ROOT="/opt/igt/libexec/igt-gpu-tools"
> +
> +COPY scripts/docker-help.sh /usr/local/bin/docker-help.sh

I would also put this one in .gitlab-ci/

> +
> +CMD docker-help.sh
> diff --git a/scripts/docker-help.sh b/scripts/docker-help.sh
> new file mode 100755
> index 00000000..671da137
> --- /dev/null
> +++ b/scripts/docker-help.sh
> @@ -0,0 +1,34 @@
> +#!/bin/sh
> +#
> +# Copyright © 2019 Intel Corporation
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice (including the next
> +# paragraph) shall be included in all copies or substantial portions of the
> +# Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> +# IN THE SOFTWARE.
> +
> +TEST_LIST=$(find /opt/igt/libexec -type f -printf "%f ")

Shouldn't it be /opt/igt/libexec/igt-gpu-tools?

> +cat << END
> +This is a docker container, packaged with intel-gpu-tools.
> + - IGT runner is available in PATH. In order for results to be available on a
> +   host system, the directory has to be mounted inside, e.g.
> +     docker run -v results:/tmp/results igt-final igt_runner /tmp/results
> + - Test lists are available in /opt/igt/share/igt-gpu-tools
> + - Test binaries are available in IGT_TEST_ROOT=/opt/igt/libexec.

Can you mention --priviledged/seccomp shenanigans for testing real HW
from inside the container?

> +Contents of /opt/igt/libexec: $TEST_LIST

Also print PATH, LD_LIBRARY_PATH, IGT_TEST_ROOT so people know what they
are getting set for free.

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

Re: [igt-dev] [PATCH v2 1/3] gitlab-ci: move containers section to the up

[Arkadiusz Hiler]

On Tue, Aug 20, 2019 at 04:19:34PM +0300, Oleg Vasilev wrote:
> No functional changes. This order is consistent with the order of
> execution stages.
> 
> Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>

with s/up/top/ in the subject

Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH v2 3/3] gitlab-ci: introduce final containers

[Vasilev, Oleg]

[-- Attachment #1.1: Type: text/plain, Size: 2002 bytes --]

On Thu, 2019-08-22 at 11:45 +0300, Arkadiusz Hiler wrote:
> On Tue, Aug 20, 2019 at 04:19:36PM +0300, Oleg Vasilev wrote:
...
> >  
> > +############## FINAL CONTAINERS ####################
> > +
> > +
> > +final-containers:igt-final:
> 
> I am sceptical about having it named igt-final.
> 
> How about just igt-x86_64?
> 
> If you need further clarification on what people should use then you
> can
> add "build-env-" to the name of the *base* images.
Hi, 

I could rename igt-final to igt and igt-* to igt-base-*. Would it break
any preexiting automatization? 

> 
> > +  stage: final-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/igt-fedora
> > +    - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora igt-
> > fedora
> > +    - scripts/pull-or-rebuild.sh Dockerfile.final igt-final
> > diff --git a/Dockerfile.final b/Dockerfile.final
> > new file mode 100644
> > index 00000000..214a5c20
> > --- /dev/null
> > +++ b/Dockerfile.final
> > @@ -0,0 +1,16 @@
> > +# Version number to bump for force image rebuild: 0
> > +FROM igt-fedora
> > +
> > +RUN dnf install -y findutils && \
> > +        dnf clean all
> > +
> > +COPY opt-igt /opt/igt
> > +COPY scripts/docker-help.sh /usr/local/bin/docker-help.sh
> > +
> > +ENV PATH="/opt/igt/bin:${PATH}"
> > +ENV
> > LD_LIBRARY_PATH="/opt/igt/lib:/opt/igt/lib64:${LD_LIBRARY_PATH}"
> > +ENV IGT_TEST_ROOT="/opt/igt/libexec/igt-gpu-tools"
> > +
> > +COPY scripts/docker-help.sh /usr/local/bin/docker-help.sh
> 
> I would also put this one in .gitlab-ci/

This not technically CI-related, but docker-related. Why not leave it
in scripts/?

Oleg

[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3261 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

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

Re: [igt-dev] [PATCH v2 3/3] gitlab-ci: introduce final containers

[Arkadiusz Hiler]

On Fri, Aug 23, 2019 at 03:41:03PM +0300, Vasilev, Oleg wrote:
> On Thu, 2019-08-22 at 11:45 +0300, Arkadiusz Hiler wrote:
> > On Tue, Aug 20, 2019 at 04:19:36PM +0300, Oleg Vasilev wrote:
> ...
> > >  
> > > +############## FINAL CONTAINERS ####################
> > > +
> > > +
> > > +final-containers:igt-final:
> > 
> > I am sceptical about having it named igt-final.
> > 
> > How about just igt-x86_64?
> > 
> > If you need further clarification on what people should use then you
> > can
> > add "build-env-" to the name of the *base* images.
> Hi, 
> 
> I could rename igt-final to igt and igt-* to igt-base-*. Would it break
> any preexiting automatization? 

AFAIK nothing uses those containers outside of Gitlab's CI, so we should
be good.

Thinking about naming, I believe we should have more clear separation.
"igt-$(ARCH/OTHERSUFFIXES)" for the containers having IGT inside.
With that I would like to avoid using "igt" for containers without IGT.

So what about:

builder-fedora
builder-debian
builder-debian-mips
...?

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

Re: [igt-dev] [PATCH v2 3/3] gitlab-ci: introduce final containers

[Arkadiusz Hiler]

On Fri, Aug 23, 2019 at 03:41:03PM +0300, Vasilev, Oleg wrote:
> > > +COPY scripts/docker-help.sh /usr/local/bin/docker-help.sh
> > 
> > I would also put this one in .gitlab-ci/
> 
> This not technically CI-related, but docker-related. Why not leave it
> in scripts/?
> 
> Oleg

Because it explains how to use container when you first try to run it
without any parameters. It makes no sense outside of this scope.

If you keep it in scripts/ then someone will see it there along
run-tests.sh, will try run it and get confused :-)

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