* [igt-dev] [PATCH v4 2/6] gitlab-ci: rename igt-* container to build-*
2019-08-27 14:01 [igt-dev] [PATCH v4 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
@ 2019-08-27 14:01 ` Oleg Vasilev
2019-08-27 14:01 ` [igt-dev] [PATCH v4 3/6] gitlab-ci: rename Dockerfiles Oleg Vasilev
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Oleg Vasilev @ 2019-08-27 14:01 UTC (permalink / raw)
To: igt-dev
igt-* better suits for containers which contain IGT inside, while
build-* is better for containers which are used to build IGT.
Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
.gitlab-ci.yml | 70 +++++++++++++++++++++++------------------------
Dockerfile.debian | 2 +-
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d47c9514..7c4c8227 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora:latest
+image: $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:latest
variables:
MESON_OPTIONS: >
-Dlibdrm_drivers=intel,nouveau,amdgpu
@@ -12,15 +12,15 @@ variables:
LANG: "C.UTF-8"
stages:
- - containers
+ - build-containers
- build
- test
- deploy
-################# CONTAINERS #######################
+################# BUILD CONTAINERS #######################
-containers:igt-debian:
- stage: containers
+build-containers:build-debian:
+ stage: build-containers
image: docker:stable
only:
changes:
@@ -34,13 +34,13 @@ 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
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal -t build-debian-minimal -f Dockerfile.debian-minimal .
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian -f Dockerfile.debian .
+ - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal
+ - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian
-containers:igt-debian-armhf:
- stage: containers
+build-containers:build-debian-armhf:
+ stage: build-containers
image: docker:stable
only:
changes:
@@ -53,11 +53,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
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf -f Dockerfile.debian-armhf .
+ - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf
-containers:igt-debian-arm64:
- stage: containers
+build-containers:build-debian-arm64:
+ stage: build-containers
image: docker:stable
only:
changes:
@@ -70,11 +70,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
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64 -f Dockerfile.debian-arm64 .
+ - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64
-containers:igt-debian-mips:
- stage: containers
+build-containers:build-debian-mips:
+ stage: build-containers
image: docker:stable
only:
changes:
@@ -87,11 +87,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
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips -f Dockerfile.debian-mips .
+ - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips
-containers:igt-fedora:
- stage: containers
+build-containers:build-fedora:
+ stage: build-containers
image: docker:stable
only:
changes:
@@ -104,8 +104,8 @@ 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
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora -f Dockerfile.fedora .
+ - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora
#################### BUILD #########################
@@ -148,7 +148,7 @@ build:tests-fedora-clang:
- build
build:tests-debian-meson:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:latest
stage: build
script:
- meson $MESON_OPTIONS build
@@ -159,7 +159,7 @@ build:tests-debian-meson:
- meson-test-list.txt
build:tests-debian-minimal:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:latest
stage: build
script:
- meson -Dtests=disabled -Dlibdrm_drivers="" build
@@ -169,7 +169,7 @@ build:tests-debian-minimal:
- build
build:tests-debian-meson-armhf:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-armhf:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf:latest
stage: build
script:
- export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
@@ -180,7 +180,7 @@ build:tests-debian-meson-armhf:
- build
build:tests-debian-meson-arm64:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-arm64:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64:latest
stage: build
script:
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/
@@ -191,7 +191,7 @@ build:tests-debian-meson-arm64:
- build
build:tests-debian-meson-mips:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-mips:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips:latest
stage: build
script:
- export PKG_CONFIG_PATH=/usr/lib/mips-linux-gnu/pkgconfig/
@@ -202,7 +202,7 @@ build:tests-debian-meson-mips:
- build
build:tests-debian-autotools:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:latest
stage: build
script:
- ./autogen.sh --enable-{chamelium,audio,intel,amdgpu,nouveau,tests,runner}
@@ -229,14 +229,14 @@ test:ninja-test-clang:
script: ninja -C build test
test:ninja-test-minimal:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:latest
dependencies:
- build:tests-debian-minimal
stage: test
script: ninja -C build test
test:ninja-test-arm64:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-arm64:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64:latest
dependencies:
- build:tests-debian-meson-arm64
stage: test
@@ -250,7 +250,7 @@ test:ninja-test-arm64:
when: on_failure
test:ninja-test-armhf:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-armhf:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf:latest
dependencies:
- build:tests-debian-meson-armhf
stage: test
@@ -264,7 +264,7 @@ test:ninja-test-armhf:
when: on_failure
test:ninja-test-mips:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-mips:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips:latest
dependencies:
- build:tests-debian-meson-mips
stage: test
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 717630e1..2749b177 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -1,4 +1,4 @@
-FROM igt-debian-minimal
+FROM build-debian-minimal
RUN apt-get update
RUN apt-get install -y \
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread* [igt-dev] [PATCH v4 3/6] gitlab-ci: rename Dockerfiles
2019-08-27 14:01 [igt-dev] [PATCH v4 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
2019-08-27 14:01 ` [igt-dev] [PATCH v4 2/6] gitlab-ci: rename igt-* container to build-* Oleg Vasilev
@ 2019-08-27 14:01 ` Oleg Vasilev
2019-08-27 14:02 ` [igt-dev] [PATCH v4 4/6] gitlab-ci: rebuild images only on Dockerfile changes Oleg Vasilev
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Oleg Vasilev @ 2019-08-27 14:01 UTC (permalink / raw)
To: igt-dev
Dockerfile.build-* is consistent with build-* naming.
Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
.gitlab-ci.yml | 24 +++++++++----------
Dockerfile.debian => Dockerfile.build-debian | 0
...ian-arm64 => Dockerfile.build-debian-arm64 | 0
...ian-armhf => Dockerfile.build-debian-armhf | 0
...minimal => Dockerfile.build-debian-minimal | 0
...ebian-mips => Dockerfile.build-debian-mips | 0
Dockerfile.fedora => Dockerfile.build-fedora | 0
7 files changed, 12 insertions(+), 12 deletions(-)
rename Dockerfile.debian => Dockerfile.build-debian (100%)
rename Dockerfile.debian-arm64 => Dockerfile.build-debian-arm64 (100%)
rename Dockerfile.debian-armhf => Dockerfile.build-debian-armhf (100%)
rename Dockerfile.debian-minimal => Dockerfile.build-debian-minimal (100%)
rename Dockerfile.debian-mips => Dockerfile.build-debian-mips (100%)
rename Dockerfile.fedora => Dockerfile.build-fedora (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c4c8227..3433ca08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,8 @@ build-containers:build-debian:
image: docker:stable
only:
changes:
- - Dockerfile.debian-minimal
- - Dockerfile.debian
+ - Dockefile.build-debian-minimal
+ - Dockefile.build-debian
- .gitlab-ci.yml
services:
- docker:dind
@@ -34,8 +34,8 @@ build-containers:build-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/build-debian-minimal -t build-debian-minimal -f Dockerfile.debian-minimal .
- - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian -f Dockerfile.debian .
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal -t build-debian-minimal -f Dockefile.build-debian-minimal .
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian -f Dockefile.build-debian .
- docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal
- docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian
@@ -44,7 +44,7 @@ build-containers:build-debian-armhf:
image: docker:stable
only:
changes:
- - Dockerfile.debian-armhf
+ - Dockefile.build-debian-armhf
- .gitlab-ci.yml
services:
- docker:dind
@@ -53,7 +53,7 @@ build-containers:build-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/build-debian-armhf -f Dockerfile.debian-armhf .
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf -f Dockefile.build-debian-armhf .
- docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf
build-containers:build-debian-arm64:
@@ -61,7 +61,7 @@ build-containers:build-debian-arm64:
image: docker:stable
only:
changes:
- - Dockerfile.debian-arm64
+ - Dockefile.build-debian-arm64
- .gitlab-ci.yml
services:
- docker:dind
@@ -70,7 +70,7 @@ build-containers:build-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/build-debian-arm64 -f Dockerfile.debian-arm64 .
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64 -f Dockefile.build-debian-arm64 .
- docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64
build-containers:build-debian-mips:
@@ -78,7 +78,7 @@ build-containers:build-debian-mips:
image: docker:stable
only:
changes:
- - Dockerfile.debian-mips
+ - Dockefile.build-debian-mips
- .gitlab-ci.yml
services:
- docker:dind
@@ -87,7 +87,7 @@ build-containers:build-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/build-debian-mips -f Dockerfile.debian-mips .
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips -f Dockefile.build-debian-mips .
- docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips
build-containers:build-fedora:
@@ -95,7 +95,7 @@ build-containers:build-fedora:
image: docker:stable
only:
changes:
- - Dockerfile.fedora
+ - Dockefile.build-fedora
- .gitlab-ci.yml
services:
- docker:dind
@@ -104,7 +104,7 @@ build-containers:build-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/build-fedora -f Dockerfile.fedora .
+ - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora -f Dockefile.build-fedora .
- docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora
#################### BUILD #########################
diff --git a/Dockerfile.debian b/Dockerfile.build-debian
similarity index 100%
rename from Dockerfile.debian
rename to Dockerfile.build-debian
diff --git a/Dockerfile.debian-arm64 b/Dockerfile.build-debian-arm64
similarity index 100%
rename from Dockerfile.debian-arm64
rename to Dockerfile.build-debian-arm64
diff --git a/Dockerfile.debian-armhf b/Dockerfile.build-debian-armhf
similarity index 100%
rename from Dockerfile.debian-armhf
rename to Dockerfile.build-debian-armhf
diff --git a/Dockerfile.debian-minimal b/Dockerfile.build-debian-minimal
similarity index 100%
rename from Dockerfile.debian-minimal
rename to Dockerfile.build-debian-minimal
diff --git a/Dockerfile.debian-mips b/Dockerfile.build-debian-mips
similarity index 100%
rename from Dockerfile.debian-mips
rename to Dockerfile.build-debian-mips
diff --git a/Dockerfile.fedora b/Dockerfile.build-fedora
similarity index 100%
rename from Dockerfile.fedora
rename to Dockerfile.build-fedora
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread* [igt-dev] [PATCH v4 4/6] gitlab-ci: rebuild images only on Dockerfile changes
2019-08-27 14:01 [igt-dev] [PATCH v4 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
2019-08-27 14:01 ` [igt-dev] [PATCH v4 2/6] gitlab-ci: rename igt-* container to build-* Oleg Vasilev
2019-08-27 14:01 ` [igt-dev] [PATCH v4 3/6] gitlab-ci: rename Dockerfiles Oleg Vasilev
@ 2019-08-27 14:02 ` Oleg Vasilev
2019-08-27 14:02 ` [igt-dev] [PATCH v4 5/6] gitlab-ci: use images tagged with git ref instead of latest Oleg Vasilev
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Oleg Vasilev @ 2019-08-27 14:02 UTC (permalink / raw)
To: igt-dev
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.
V2:
- Rename gitlab-ci to .gitlab-ci (Arek)
- Add commit-$CI_COMMIT_SHA
Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
.gitlab-ci.yml | 39 ++++--------------------
.gitlab-ci/pull-or-rebuild.sh | 56 +++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 33 deletions(-)
create mode 100755 .gitlab-ci/pull-or-rebuild.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3433ca08..0d40b493 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,11 +22,6 @@ stages:
build-containers:build-debian:
stage: build-containers
image: docker:stable
- only:
- changes:
- - Dockefile.build-debian-minimal
- - Dockefile.build-debian
- - .gitlab-ci.yml
services:
- docker:dind
variables:
@@ -34,18 +29,12 @@ build-containers:build-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/build-debian-minimal -t build-debian-minimal -f Dockefile.build-debian-minimal .
- - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian -f Dockefile.build-debian .
- - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal
- - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian
+ - .gitlab-ci/pull-or-rebuild.sh Dockerfile.build-debian-minimal build-debian-minimal
+ - .gitlab-ci/pull-or-rebuild.sh Dockerfile.build-debian build-debian
build-containers:build-debian-armhf:
stage: build-containers
image: docker:stable
- only:
- changes:
- - Dockefile.build-debian-armhf
- - .gitlab-ci.yml
services:
- docker:dind
variables:
@@ -53,16 +42,11 @@ build-containers:build-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/build-debian-armhf -f Dockefile.build-debian-armhf .
- - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf
+ - .gitlab-ci/pull-or-rebuild.sh Dockerfile.build-debian-armhf build-debian-armhf
build-containers:build-debian-arm64:
stage: build-containers
image: docker:stable
- only:
- changes:
- - Dockefile.build-debian-arm64
- - .gitlab-ci.yml
services:
- docker:dind
variables:
@@ -70,16 +54,11 @@ build-containers:build-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/build-debian-arm64 -f Dockefile.build-debian-arm64 .
- - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64
+ - .gitlab-ci/pull-or-rebuild.sh Dockerfile.build-debian-arm64 build-debian-arm64
build-containers:build-debian-mips:
stage: build-containers
image: docker:stable
- only:
- changes:
- - Dockefile.build-debian-mips
- - .gitlab-ci.yml
services:
- docker:dind
variables:
@@ -87,16 +66,11 @@ build-containers:build-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/build-debian-mips -f Dockefile.build-debian-mips .
- - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips
+ - .gitlab-ci/pull-or-rebuild.sh Dockerfile.build-debian-mips build-debian-mips
build-containers:build-fedora:
stage: build-containers
image: docker:stable
- only:
- changes:
- - Dockefile.build-fedora
- - .gitlab-ci.yml
services:
- docker:dind
variables:
@@ -104,8 +78,7 @@ build-containers:build-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/build-fedora -f Dockefile.build-fedora .
- - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora
+ - .gitlab-ci/pull-or-rebuild.sh Dockerfile.build-fedora build-fedora
#################### BUILD #########################
diff --git a/.gitlab-ci/pull-or-rebuild.sh b/.gitlab-ci/pull-or-rebuild.sh
new file mode 100755
index 00000000..182c8d49
--- /dev/null
+++ b/.gitlab-ci/pull-or-rebuild.sh
@@ -0,0 +1,56 @@
+#!/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
+REF=${3:-${CI_COMMIT_REF_NAME:-latest}}
+
+REF=$(echo $REF | tr / - )
+IMAGENAME=$CI_REGISTRY/$CI_PROJECT_PATH/$NAME
+DOCKERFILE_CHECKSUM=$(sha1sum $DOCKERFILE | cut -d ' ' -f1)
+
+REFNAME=$IMAGENAME:$REF
+DOCKERNAME=$IMAGENAME:dockerfile-$DOCKERFILE_CHECKSUM
+COMMITNAME=$IMAGENAME:commit-$CI_COMMIT_SHA
+
+docker pull $DOCKERNAME
+IMAGE_PRESENT=$?
+
+set -e
+if [ $IMAGE_PRESENT -eq 0 ] && [ ${FORCE_REBUILD:-0} -eq 0 ] ; then
+ echo "Skipping $NAME:$TAG, already built"
+ docker tag $DOCKERNAME $NAME
+ docker tag $DOCKERNAME $REFNAME
+ docker tag $DOCKERNAME $COMMITNAME
+else
+ echo "Building $NAME:$TAG"
+ docker build -t $DOCKERNAME -t $NAME \
+ -t $REFNAME -t $COMMITNAME -f $DOCKERFILE .
+ docker push $DOCKERNAME
+fi
+docker push $REFNAME
+docker push $COMMITNAME
+if [ $TAG = "master" ]; then
+ docker tag $CHECKNAME $IMAGENAME
+ docker push $IMAGENAME
+fi
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread* [igt-dev] [PATCH v4 5/6] gitlab-ci: use images tagged with git ref instead of latest
2019-08-27 14:01 [igt-dev] [PATCH v4 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
` (2 preceding siblings ...)
2019-08-27 14:02 ` [igt-dev] [PATCH v4 4/6] gitlab-ci: rebuild images only on Dockerfile changes Oleg Vasilev
@ 2019-08-27 14:02 ` Oleg Vasilev
2019-08-27 14:02 ` [igt-dev] [PATCH v4 6/6] gitlab-ci: introduce containers with IGT inside Oleg Vasilev
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Oleg Vasilev @ 2019-08-27 14:02 UTC (permalink / raw)
To: igt-dev
Since different images can be present at the same time, it is better to
always use the one built for this particular git reference.
Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
V3:
- Change $CI_COMMIT_REF_NAME to commit-$CI_COMMIT_SHA
Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
.gitlab-ci.yml | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d40b493..0ac12318 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:latest
+image: $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:commit-$CI_COMMIT_SHA
variables:
MESON_OPTIONS: >
-Dlibdrm_drivers=intel,nouveau,amdgpu
@@ -121,7 +121,7 @@ build:tests-fedora-clang:
- build
build:tests-debian-meson:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:commit-$CI_COMMIT_SHA
stage: build
script:
- meson $MESON_OPTIONS build
@@ -132,7 +132,7 @@ build:tests-debian-meson:
- meson-test-list.txt
build:tests-debian-minimal:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:commit-$CI_COMMIT_SHA
stage: build
script:
- meson -Dtests=disabled -Dlibdrm_drivers="" build
@@ -142,7 +142,7 @@ build:tests-debian-minimal:
- build
build:tests-debian-meson-armhf:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf:commit-$CI_COMMIT_SHA
stage: build
script:
- export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
@@ -153,7 +153,7 @@ build:tests-debian-meson-armhf:
- build
build:tests-debian-meson-arm64:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64:commit-$CI_COMMIT_SHA
stage: build
script:
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/
@@ -164,7 +164,7 @@ build:tests-debian-meson-arm64:
- build
build:tests-debian-meson-mips:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips:commit-$CI_COMMIT_SHA
stage: build
script:
- export PKG_CONFIG_PATH=/usr/lib/mips-linux-gnu/pkgconfig/
@@ -175,7 +175,7 @@ build:tests-debian-meson-mips:
- build
build:tests-debian-autotools:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:commit-$CI_COMMIT_SHA
stage: build
script:
- ./autogen.sh --enable-{chamelium,audio,intel,amdgpu,nouveau,tests,runner}
@@ -202,14 +202,14 @@ test:ninja-test-clang:
script: ninja -C build test
test:ninja-test-minimal:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:commit-$CI_COMMIT_SHA
dependencies:
- build:tests-debian-minimal
stage: test
script: ninja -C build test
test:ninja-test-arm64:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64:commit-$CI_COMMIT_SHA
dependencies:
- build:tests-debian-meson-arm64
stage: test
@@ -223,7 +223,7 @@ test:ninja-test-arm64:
when: on_failure
test:ninja-test-armhf:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf:commit-$CI_COMMIT_SHA
dependencies:
- build:tests-debian-meson-armhf
stage: test
@@ -237,7 +237,7 @@ test:ninja-test-armhf:
when: on_failure
test:ninja-test-mips:
- image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips:commit-$CI_COMMIT_SHA
dependencies:
- build:tests-debian-meson-mips
stage: test
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread* [igt-dev] [PATCH v4 6/6] gitlab-ci: introduce containers with IGT inside
2019-08-27 14:01 [igt-dev] [PATCH v4 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
` (3 preceding siblings ...)
2019-08-27 14:02 ` [igt-dev] [PATCH v4 5/6] gitlab-ci: use images tagged with git ref instead of latest Oleg Vasilev
@ 2019-08-27 14:02 ` Oleg Vasilev
2019-08-28 6:03 ` Arkadiusz Hiler
2019-08-27 14:29 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v4,1/6] gitlab-ci: move containers section to the top Patchwork
2019-08-28 12:58 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
6 siblings, 1 reply; 10+ messages in thread
From: Oleg Vasilev @ 2019-08-27 14:02 UTC (permalink / raw)
To: igt-dev
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 +++++++++++++++++++++++-
.gitlab-ci/docker-help.sh | 41 +++++++++++++++++++++++++++++++++++++++
Dockerfile | 14 +++++++++++++
3 files changed, 79 insertions(+), 1 deletion(-)
create mode 100755 .gitlab-ci/docker-help.sh
create mode 100644 Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ac12318..76862514 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ stages:
- build
- test
- deploy
+ - containers
################# BUILD CONTAINERS #######################
@@ -85,12 +86,15 @@ build-containers:build-fedora:
build:tests-fedora:
stage: build
script:
- - meson $MESON_OPTIONS build
+ - meson --prefix=`pwd`/opt-igt $MESON_OPTIONS build
- ninja -C build
+ - ninja -C build install
- ninja -C build igt-gpu-tools-doc
+ - ls opt-igt
artifacts:
paths:
- build
+ - opt-igt
build:tests-fedora-no-libunwind:
stage: build
@@ -273,3 +277,22 @@ pages:
only:
- master
+############## CONTAINERS ####################
+
+
+containers:igt:
+ stage: containers
+ image: docker:stable
+ services:
+ - docker:dind
+ dependencies:
+ - build:tests-fedora
+ variables:
+ DOCKER_HOST: tcp://docker:2375
+ DOCKER_DRIVER: overlay2
+ FORCE_REBUILD: 1
+ script:
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+ - docker pull $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:$CI_COMMIT_REF_NAME
+ - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:$CI_COMMIT_REF_NAME build-fedora
+ - .gitlab-ci/pull-or-rebuild.sh Dockerfile igt
diff --git a/.gitlab-ci/docker-help.sh b/.gitlab-ci/docker-help.sh
new file mode 100755
index 00000000..6e3f8021
--- /dev/null
+++ b/.gitlab-ci/docker-help.sh
@@ -0,0 +1,41 @@
+#!/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/igt-gpu-tools -type f -printf "%f ")
+cat << END
+This is a docker container, packaged with the igt-gpu-tools.
+ - igt_runner is in the \$PATH. In order for the results to be available on the
+ host system, the directory has to be made available inside, e.g.
+ docker run -v results:/tmp/results igt-final igt_runner /tmp/results
+ - The test lists are in /opt/igt/share/igt-gpu-tools
+ - The test binaries are in \$IGT_TEST_ROOT=$IGT_TEST_ROOT
+
+In order for the graphic devices to be available inside the docker container,
+those either need to be mapped with --device or the container needs to be run
+in --privileged mode.
+
+Contents of /opt/igt/libexec/igt-gpu-tools: $TEST_LIST
+PATH: $PATH
+LD_LIBRARY_PATH: $LD_LIBRARY_PATH
+IGT_TEST_ROOT: $IGT_TEST_ROOT
+END
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..b601aecd
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+# Version number to bump for force image rebuild: 0
+FROM build-fedora
+
+RUN dnf install -y findutils && \
+ dnf clean all
+
+COPY opt-igt /opt/igt
+COPY .gitlab-ci/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"
+
+CMD docker-help.sh
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [igt-dev] [PATCH v4 6/6] gitlab-ci: introduce containers with IGT inside
2019-08-27 14:02 ` [igt-dev] [PATCH v4 6/6] gitlab-ci: introduce containers with IGT inside Oleg Vasilev
@ 2019-08-28 6:03 ` Arkadiusz Hiler
2019-08-28 10:13 ` Vasilev, Oleg
0 siblings, 1 reply; 10+ messages in thread
From: Arkadiusz Hiler @ 2019-08-28 6:03 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
On Tue, Aug 27, 2019 at 05:02:02PM +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 +++++++++++++++++++++++-
> .gitlab-ci/docker-help.sh | 41 +++++++++++++++++++++++++++++++++++++++
> Dockerfile | 14 +++++++++++++
> 3 files changed, 79 insertions(+), 1 deletion(-)
> create mode 100755 .gitlab-ci/docker-help.sh
> create mode 100644 Dockerfile
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 0ac12318..76862514 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -16,6 +16,7 @@ stages:
> - build
> - test
> - deploy
> + - containers
I am not sure it is the right call to make that a stage after deploy.
deploy:pages is buggy and fails often:
https://gitlab.freedesktop.org/freedesktop/freedesktop/issues/46
For pre-merge it should be ok, if it proves to be troublesome we can
shuffle it around then.
> ################# BUILD CONTAINERS #######################
>
> @@ -85,12 +86,15 @@ build-containers:build-fedora:
> build:tests-fedora:
> stage: build
> script:
> - - meson $MESON_OPTIONS build
> + - meson --prefix=`pwd`/opt-igt $MESON_OPTIONS build
> - ninja -C build
> + - ninja -C build install
> - ninja -C build igt-gpu-tools-doc
> + - ls opt-igt
Leftover ls?
> artifacts:
> paths:
> - build
> + - opt-igt
>
> build:tests-fedora-no-libunwind:
> stage: build
> @@ -273,3 +277,22 @@ pages:
> only:
> - master
>
> +############## CONTAINERS ####################
> +
> +
> +containers:igt:
> + stage: containers
> + image: docker:stable
> + services:
> + - docker:dind
> + dependencies:
> + - build:tests-fedora
> + variables:
> + DOCKER_HOST: tcp://docker:2375
> + DOCKER_DRIVER: overlay2
> + FORCE_REBUILD: 1
> + script:
> + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
> + - docker pull $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:$CI_COMMIT_REF_NAME
> + - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:$CI_COMMIT_REF_NAME build-fedora
You forgot to change those to use commit-$CI_COMMIT_SHA:
https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/540405
> + - .gitlab-ci/pull-or-rebuild.sh Dockerfile igt
> diff --git a/.gitlab-ci/docker-help.sh b/.gitlab-ci/docker-help.sh
> new file mode 100755
> index 00000000..6e3f8021
> --- /dev/null
> +++ b/.gitlab-ci/docker-help.sh
> @@ -0,0 +1,41 @@
> +#!/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/igt-gpu-tools -type f -printf "%f ")
> +cat << END
> +This is a docker container, packaged with the igt-gpu-tools.
> + - igt_runner is in the \$PATH. In order for the results to be available on the
> + host system, the directory has to be made available inside, e.g.
> + docker run -v results:/tmp/results igt-final igt_runner /tmp/results
> + - The test lists are in /opt/igt/share/igt-gpu-tools
> + - The test binaries are in \$IGT_TEST_ROOT=$IGT_TEST_ROOT
> +
> +In order for the graphic devices to be available inside the docker container,
> +those either need to be mapped with --device or the container needs to be run
> +in --privileged mode.
> +
> +Contents of /opt/igt/libexec/igt-gpu-tools: $TEST_LIST
> +PATH: $PATH
> +LD_LIBRARY_PATH: $LD_LIBRARY_PATH
> +IGT_TEST_ROOT: $IGT_TEST_ROOT
> +END
> diff --git a/Dockerfile b/Dockerfile
> new file mode 100644
> index 00000000..b601aecd
> --- /dev/null
> +++ b/Dockerfile
> @@ -0,0 +1,14 @@
> +# Version number to bump for force image rebuild: 0
> +FROM build-fedora
> +
> +RUN dnf install -y findutils && \
> + dnf clean all
I think we should move those to the base image - `dnf install` seems to
be the most failure-prone part of this whole endeavor. It's the most
common reason that igt-ci-tags for pre-merge fails (after the other
issues were addressed).
With the things above fixed, the whole series is:
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
--
Cheers,
Arek
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [igt-dev] [PATCH v4 6/6] gitlab-ci: introduce containers with IGT inside
2019-08-28 6:03 ` Arkadiusz Hiler
@ 2019-08-28 10:13 ` Vasilev, Oleg
0 siblings, 0 replies; 10+ messages in thread
From: Vasilev, Oleg @ 2019-08-28 10:13 UTC (permalink / raw)
To: Hiler, Arkadiusz; +Cc: igt-dev@lists.freedesktop.org
[-- Attachment #1.1: Type: text/plain, Size: 6237 bytes --]
On Wed, 2019-08-28 at 09:03 +0300, Arkadiusz Hiler wrote:
> On Tue, Aug 27, 2019 at 05:02:02PM +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 +++++++++++++++++++++++-
> > .gitlab-ci/docker-help.sh | 41
> > +++++++++++++++++++++++++++++++++++++++
> > Dockerfile | 14 +++++++++++++
> > 3 files changed, 79 insertions(+), 1 deletion(-)
> > create mode 100755 .gitlab-ci/docker-help.sh
> > create mode 100644 Dockerfile
> >
> > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> > index 0ac12318..76862514 100644
> > --- a/.gitlab-ci.yml
> > +++ b/.gitlab-ci.yml
> > @@ -16,6 +16,7 @@ stages:
> > - build
> > - test
> > - deploy
> > + - containers
>
> I am not sure it is the right call to make that a stage after deploy.
>
> deploy:pages is buggy and fails often:
> https://gitlab.freedesktop.org/freedesktop/freedesktop/issues/46
>
> For pre-merge it should be ok, if it proves to be troublesome we can
> shuffle it around then.
Can I just swap deploy and containers?
>
> > ################# BUILD CONTAINERS #######################
> >
> > @@ -85,12 +86,15 @@ build-containers:build-fedora:
> > build:tests-fedora:
> > stage: build
> > script:
> > - - meson $MESON_OPTIONS build
> > + - meson --prefix=`pwd`/opt-igt $MESON_OPTIONS build
> > - ninja -C build
> > + - ninja -C build install
> > - ninja -C build igt-gpu-tools-doc
> > + - ls opt-igt
>
> Leftover ls?
>
> > artifacts:
> > paths:
> > - build
> > + - opt-igt
> >
> > build:tests-fedora-no-libunwind:
> > stage: build
> > @@ -273,3 +277,22 @@ pages:
> > only:
> > - master
> >
> > +############## CONTAINERS ####################
> > +
> > +
> > +containers:igt:
> > + stage: containers
> > + image: docker:stable
> > + services:
> > + - docker:dind
> > + dependencies:
> > + - build:tests-fedora
> > + variables:
> > + DOCKER_HOST: tcp://docker:2375
> > + DOCKER_DRIVER: overlay2
> > + FORCE_REBUILD: 1
> > + script:
> > + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN
> > $CI_REGISTRY
> > + - docker pull $CI_REGISTRY/$CI_PROJECT_PATH/build-
> > fedora:$CI_COMMIT_REF_NAME
> > + - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/build-
> > fedora:$CI_COMMIT_REF_NAME build-fedora
>
> You forgot to change those to use commit-$CI_COMMIT_SHA:
> https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/540405
Right, I'll retest the series over a clear registry to make sure
everything builds correctly.
>
> > + - .gitlab-ci/pull-or-rebuild.sh Dockerfile igt
> > diff --git a/.gitlab-ci/docker-help.sh b/.gitlab-ci/docker-help.sh
> > new file mode 100755
> > index 00000000..6e3f8021
> > --- /dev/null
> > +++ b/.gitlab-ci/docker-help.sh
> > @@ -0,0 +1,41 @@
> > +#!/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/igt-gpu-tools -type f -printf
> > "%f ")
> > +cat << END
> > +This is a docker container, packaged with the igt-gpu-tools.
> > + - igt_runner is in the \$PATH. In order for the results to be
> > available on the
> > + host system, the directory has to be made available inside,
> > e.g.
> > + docker run -v results:/tmp/results igt-final igt_runner
> > /tmp/results
> > + - The test lists are in /opt/igt/share/igt-gpu-tools
> > + - The test binaries are in \$IGT_TEST_ROOT=$IGT_TEST_ROOT
> > +
> > +In order for the graphic devices to be available inside the docker
> > container,
> > +those either need to be mapped with --device or the container
> > needs to be run
> > +in --privileged mode.
> > +
> > +Contents of /opt/igt/libexec/igt-gpu-tools: $TEST_LIST
> > +PATH: $PATH
> > +LD_LIBRARY_PATH: $LD_LIBRARY_PATH
> > +IGT_TEST_ROOT: $IGT_TEST_ROOT
> > +END
> > diff --git a/Dockerfile b/Dockerfile
> > new file mode 100644
> > index 00000000..b601aecd
> > --- /dev/null
> > +++ b/Dockerfile
> > @@ -0,0 +1,14 @@
> > +# Version number to bump for force image rebuild: 0
> > +FROM build-fedora
> > +
> > +RUN dnf install -y findutils && \
> > + dnf clean all
>
> I think we should move those to the base image - `dnf install` seems
> to
> be the most failure-prone part of this whole endeavor. It's the most
> common reason that igt-ci-tags for pre-merge fails (after the other
> issues were addressed).
Well, using build image as a base for igt container should be only
temporarily. Once better base image is ready, it should then be moved there.
>
> With the things above fixed, the whole series is:
> Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
>
[-- 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v4,1/6] gitlab-ci: move containers section to the top
2019-08-27 14:01 [igt-dev] [PATCH v4 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
` (4 preceding siblings ...)
2019-08-27 14:02 ` [igt-dev] [PATCH v4 6/6] gitlab-ci: introduce containers with IGT inside Oleg Vasilev
@ 2019-08-27 14:29 ` Patchwork
2019-08-28 12:58 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
6 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2019-08-27 14:29 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
== Series Details ==
Series: series starting with [v4,1/6] gitlab-ci: move containers section to the top
URL : https://patchwork.freedesktop.org/series/65876/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6792 -> IGTPW_3383
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/65876/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_3383 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_switch@legacy-render:
- fi-bxt-dsi: [PASS][1] -> [INCOMPLETE][2] ([fdo#103927] / [fdo#111381])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html
* igt@kms_chamelium@dp-edid-read:
- fi-kbl-7500u: [PASS][3] -> [WARN][4] ([fdo#109483])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/fi-kbl-7500u/igt@kms_chamelium@dp-edid-read.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/fi-kbl-7500u/igt@kms_chamelium@dp-edid-read.html
#### Possible fixes ####
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [FAIL][5] ([fdo#103167]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381
Participating hosts (52 -> 45)
------------------------------
Additional (1): fi-tgl-u
Missing (8): fi-kbl-soraka fi-ilk-m540 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_5150 -> IGTPW_3383
CI-20190529: 20190529
CI_DRM_6792: 87f7792bc3891de3fab4fb64d66a85a66729e3d4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3383: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/
IGT_5150: a4e8217bcdfef9bb523f26a9084bbf615a6e8abb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [v4,1/6] gitlab-ci: move containers section to the top
2019-08-27 14:01 [igt-dev] [PATCH v4 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
` (5 preceding siblings ...)
2019-08-27 14:29 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v4,1/6] gitlab-ci: move containers section to the top Patchwork
@ 2019-08-28 12:58 ` Patchwork
6 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2019-08-28 12:58 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
== Series Details ==
Series: series starting with [v4,1/6] gitlab-ci: move containers section to the top
URL : https://patchwork.freedesktop.org/series/65876/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6792_full -> IGTPW_3383_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/65876/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_3383_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_switch@all-heavy:
- shard-apl: [PASS][1] -> [INCOMPLETE][2] ([fdo#103927]) +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-apl4/igt@gem_ctx_switch@all-heavy.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-apl1/igt@gem_ctx_switch@all-heavy.html
* igt@gem_eio@in-flight-suspend:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([fdo#108566]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-apl4/igt@gem_eio@in-flight-suspend.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-apl7/igt@gem_eio@in-flight-suspend.html
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#111325]) +5 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb6/igt@gem_exec_schedule@preemptive-hang-bsd.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb1/igt@gem_exec_schedule@preemptive-hang-bsd.html
* igt@gem_tiled_swapping@non-threaded:
- shard-apl: [PASS][7] -> [INCOMPLETE][8] ([fdo#103927] / [fdo#108686])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-apl6/igt@gem_tiled_swapping@non-threaded.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-apl5/igt@gem_tiled_swapping@non-threaded.html
* igt@kms_color@pipe-a-degamma:
- shard-apl: [PASS][9] -> [FAIL][10] ([fdo#104782] / [fdo#108145])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-apl3/igt@kms_color@pipe-a-degamma.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-apl8/igt@kms_color@pipe-a-degamma.html
- shard-kbl: [PASS][11] -> [FAIL][12] ([fdo#104782] / [fdo#108145])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-kbl1/igt@kms_color@pipe-a-degamma.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-kbl3/igt@kms_color@pipe-a-degamma.html
* igt@kms_cursor_legacy@cursora-vs-flipa-atomic:
- shard-snb: [PASS][13] -> [SKIP][14] ([fdo#109271]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-snb6/igt@kms_cursor_legacy@cursora-vs-flipa-atomic.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-snb1/igt@kms_cursor_legacy@cursora-vs-flipa-atomic.html
* igt@kms_frontbuffer_tracking@fbc-2p-rte:
- shard-glk: [PASS][15] -> [FAIL][16] ([fdo#103167] / [fdo#110378])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-glk2/igt@kms_frontbuffer_tracking@fbc-2p-rte.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-glk9/igt@kms_frontbuffer_tracking@fbc-2p-rte.html
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103167]) +5 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-stridechange.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-stridechange.html
* igt@kms_plane@pixel-format-pipe-b-planes-source-clamping:
- shard-iclb: [PASS][19] -> [INCOMPLETE][20] ([fdo#107713] / [fdo#110036 ])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb1/igt@kms_plane@pixel-format-pipe-b-planes-source-clamping.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb3/igt@kms_plane@pixel-format-pipe-b-planes-source-clamping.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +5 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb5/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_vblank@pipe-b-ts-continuation-modeset-hang:
- shard-hsw: [PASS][23] -> [INCOMPLETE][24] ([fdo#103540])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-hsw2/igt@kms_vblank@pipe-b-ts-continuation-modeset-hang.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-hsw5/igt@kms_vblank@pipe-b-ts-continuation-modeset-hang.html
* igt@perf_pmu@rc6-runtime-pm:
- shard-glk: [PASS][25] -> [FAIL][26] ([fdo#105010])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-glk4/igt@perf_pmu@rc6-runtime-pm.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-glk7/igt@perf_pmu@rc6-runtime-pm.html
- shard-apl: [PASS][27] -> [FAIL][28] ([fdo#105010])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-apl7/igt@perf_pmu@rc6-runtime-pm.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-apl4/igt@perf_pmu@rc6-runtime-pm.html
- shard-kbl: [PASS][29] -> [FAIL][30] ([fdo#105010])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-kbl2/igt@perf_pmu@rc6-runtime-pm.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-kbl1/igt@perf_pmu@rc6-runtime-pm.html
- shard-iclb: [PASS][31] -> [FAIL][32] ([fdo#105010])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb5/igt@perf_pmu@rc6-runtime-pm.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb1/igt@perf_pmu@rc6-runtime-pm.html
- shard-hsw: [PASS][33] -> [FAIL][34] ([fdo#105010])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-hsw6/igt@perf_pmu@rc6-runtime-pm.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-hsw2/igt@perf_pmu@rc6-runtime-pm.html
* igt@prime_busy@hang-bsd2:
- shard-iclb: [PASS][35] -> [SKIP][36] ([fdo#109276]) +11 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb1/igt@prime_busy@hang-bsd2.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb8/igt@prime_busy@hang-bsd2.html
#### Possible fixes ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][37] ([fdo#110841]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd.html
* igt@gem_exec_schedule@deep-bsd:
- shard-iclb: [SKIP][39] ([fdo#111325]) -> [PASS][40] +8 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb1/igt@gem_exec_schedule@deep-bsd.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb5/igt@gem_exec_schedule@deep-bsd.html
* igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd2:
- shard-iclb: [SKIP][41] ([fdo#109276]) -> [PASS][42] +14 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb5/igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd2.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb4/igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd2.html
* igt@i915_pm_rc6_residency@rc6-accuracy:
- shard-snb: [SKIP][43] ([fdo#109271]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-snb1/igt@i915_pm_rc6_residency@rc6-accuracy.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-snb4/igt@i915_pm_rc6_residency@rc6-accuracy.html
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: [DMESG-WARN][45] ([fdo#108566]) -> [PASS][46] +4 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-apl4/igt@i915_suspend@fence-restore-untiled.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-apl3/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_busy@basic-flip-b:
- shard-kbl: [DMESG-WARN][47] ([fdo#111317]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-kbl7/igt@kms_busy@basic-flip-b.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-kbl1/igt@kms_busy@basic-flip-b.html
* igt@kms_cursor_edge_walk@pipe-b-128x128-top-edge:
- shard-apl: [INCOMPLETE][49] ([fdo#103927]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-apl8/igt@kms_cursor_edge_walk@pipe-b-128x128-top-edge.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-apl5/igt@kms_cursor_edge_walk@pipe-b-128x128-top-edge.html
* igt@kms_flip@flip-vs-suspend:
- shard-hsw: [INCOMPLETE][51] ([fdo#103540]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-hsw5/igt@kms_flip@flip-vs-suspend.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-hsw5/igt@kms_flip@flip-vs-suspend.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-render:
- shard-iclb: [FAIL][53] ([fdo#103167]) -> [PASS][54] +6 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-render.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-render.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][55] ([fdo#103166]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-x.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb2/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][57] ([fdo#109642] / [fdo#111068]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb8/igt@kms_psr2_su@frontbuffer.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_sprite_render:
- shard-iclb: [SKIP][59] ([fdo#109441]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb3/igt@kms_psr@psr2_sprite_render.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb2/igt@kms_psr@psr2_sprite_render.html
* igt@perf_pmu@enable-race-rcs0:
- shard-iclb: [INCOMPLETE][61] ([fdo#107713]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb7/igt@perf_pmu@enable-race-rcs0.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb7/igt@perf_pmu@enable-race-rcs0.html
#### Warnings ####
* igt@gem_mocs_settings@mocs-rc6-bsd2:
- shard-iclb: [FAIL][63] ([fdo#111330]) -> [SKIP][64] ([fdo#109276])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-iclb2/igt@gem_mocs_settings@mocs-rc6-bsd2.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-iclb5/igt@gem_mocs_settings@mocs-rc6-bsd2.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-snb: [SKIP][65] ([fdo#109271] / [fdo#109278]) -> [SKIP][66] ([fdo#109271])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6792/shard-snb5/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/shard-snb1/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105010]: https://bugs.freedesktop.org/show_bug.cgi?id=105010
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[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#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110036 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110036
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111317]: https://bugs.freedesktop.org/show_bug.cgi?id=111317
[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_5150 -> IGTPW_3383
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_6792: 87f7792bc3891de3fab4fb64d66a85a66729e3d4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3383: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3383/
IGT_5150: a4e8217bcdfef9bb523f26a9084bbf615a6e8abb @ 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_3383/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread