* [igt-dev] [PATCH v3 1/6] gitlab-ci: move containers section to the top
2019-08-26 13:12 [igt-dev] GitLab CI overhaul Oleg Vasilev
@ 2019-08-26 13:12 ` Oleg Vasilev
2019-08-26 13:12 ` [igt-dev] [PATCH v3 2/6] gitlab-ci: rename igt-* container to build-* Oleg Vasilev
` (6 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Oleg Vasilev @ 2019-08-26 13:12 UTC (permalink / raw)
To: igt-dev
No functional changes. This order is consistent with the order of
execution stages.
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
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.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] 13+ messages in thread* [igt-dev] [PATCH v3 2/6] gitlab-ci: rename igt-* container to build-*
2019-08-26 13:12 [igt-dev] GitLab CI overhaul Oleg Vasilev
2019-08-26 13:12 ` [igt-dev] [PATCH v3 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
@ 2019-08-26 13:12 ` Oleg Vasilev
2019-08-26 13:12 ` [igt-dev] [PATCH v3 3/6] gitlab-ci: rename Dockerfiles Oleg Vasilev
` (5 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Oleg Vasilev @ 2019-08-26 13:12 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] 13+ messages in thread* [igt-dev] [PATCH v3 3/6] gitlab-ci: rename Dockerfiles
2019-08-26 13:12 [igt-dev] GitLab CI overhaul Oleg Vasilev
2019-08-26 13:12 ` [igt-dev] [PATCH v3 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
2019-08-26 13:12 ` [igt-dev] [PATCH v3 2/6] gitlab-ci: rename igt-* container to build-* Oleg Vasilev
@ 2019-08-26 13:12 ` Oleg Vasilev
2019-08-26 13:12 ` [igt-dev] [PATCH v3 4/6] gitlab-ci: use images tagged with git ref instead of latest Oleg Vasilev
` (4 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Oleg Vasilev @ 2019-08-26 13:12 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] 13+ messages in thread* [igt-dev] [PATCH v3 4/6] gitlab-ci: use images tagged with git ref instead of latest
2019-08-26 13:12 [igt-dev] GitLab CI overhaul Oleg Vasilev
` (2 preceding siblings ...)
2019-08-26 13:12 ` [igt-dev] [PATCH v3 3/6] gitlab-ci: rename Dockerfiles Oleg Vasilev
@ 2019-08-26 13:12 ` Oleg Vasilev
2019-08-26 13:44 ` Arkadiusz Hiler
2019-08-26 13:12 ` [igt-dev] [PATCH v3 5/6] gitlab-ci: rebuild images only on Dockerfile changes Oleg Vasilev
` (3 subsequent siblings)
7 siblings, 1 reply; 13+ messages in thread
From: Oleg Vasilev @ 2019-08-26 13:12 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>
---
.gitlab-ci.yml | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3433ca08..f994db77 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:$CI_COMMIT_REF_NAME
variables:
MESON_OPTIONS: >
-Dlibdrm_drivers=intel,nouveau,amdgpu
@@ -148,7 +148,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:$CI_COMMIT_REF_NAME
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/build-debian-minimal:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:$CI_COMMIT_REF_NAME
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/build-debian-armhf:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf:$CI_COMMIT_REF_NAME
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/build-debian-arm64:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64:$CI_COMMIT_REF_NAME
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/build-debian-mips:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips:$CI_COMMIT_REF_NAME
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/build-debian:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:$CI_COMMIT_REF_NAME
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/build-debian-minimal:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:$CI_COMMIT_REF_NAME
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:$CI_COMMIT_REF_NAME
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/build-debian-armhf:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf:$CI_COMMIT_REF_NAME
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/build-debian-mips:latest
+ image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips:$CI_COMMIT_REF_NAME
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] 13+ messages in thread* Re: [igt-dev] [PATCH v3 4/6] gitlab-ci: use images tagged with git ref instead of latest
2019-08-26 13:12 ` [igt-dev] [PATCH v3 4/6] gitlab-ci: use images tagged with git ref instead of latest Oleg Vasilev
@ 2019-08-26 13:44 ` Arkadiusz Hiler
0 siblings, 0 replies; 13+ messages in thread
From: Arkadiusz Hiler @ 2019-08-26 13:44 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
On Mon, Aug 26, 2019 at 04:12:46PM +0300, Oleg Vasilev wrote:
> 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>
> ---
> .gitlab-ci.yml | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 3433ca08..f994db77 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:$CI_COMMIT_REF_NAME
We are not tagging with the $CI_COMMIT_REF_NAME name at this time, and I
think it would be better to use SHA1 at this time - more on that in the
review of the next patch.
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* [igt-dev] [PATCH v3 5/6] gitlab-ci: rebuild images only on Dockerfile changes
2019-08-26 13:12 [igt-dev] GitLab CI overhaul Oleg Vasilev
` (3 preceding siblings ...)
2019-08-26 13:12 ` [igt-dev] [PATCH v3 4/6] gitlab-ci: use images tagged with git ref instead of latest Oleg Vasilev
@ 2019-08-26 13:12 ` Oleg Vasilev
2019-08-26 13:38 ` Arkadiusz Hiler
2019-08-26 13:57 ` Arkadiusz Hiler
2019-08-26 13:12 ` [igt-dev] [PATCH v3 6/6] gitlab-ci: introduce containers with IGT inside Oleg Vasilev
` (2 subsequent siblings)
7 siblings, 2 replies; 13+ messages in thread
From: Oleg Vasilev @ 2019-08-26 13:12 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.
Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
.gitlab-ci.yml | 39 +++++----------------------
gitlab-ci/pull-or-rebuild.sh | 51 ++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 33 deletions(-)
create mode 100755 gitlab-ci/pull-or-rebuild.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f994db77..de334cf2 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..3bf9296f
--- /dev/null
+++ b/gitlab-ci/pull-or-rebuild.sh
@@ -0,0 +1,51 @@
+#!/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 / - )
+
+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
+if [ $TAG = "master" ]; then
+ docker tag $CHECKNAME $CI_REGISTRY/$CI_PROJECT_PATH/$NAME
+ docker push $CI_REGISTRY/$CI_PROJECT_PATH/$NAME
+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] 13+ messages in thread* Re: [igt-dev] [PATCH v3 5/6] gitlab-ci: rebuild images only on Dockerfile changes
2019-08-26 13:12 ` [igt-dev] [PATCH v3 5/6] gitlab-ci: rebuild images only on Dockerfile changes Oleg Vasilev
@ 2019-08-26 13:38 ` Arkadiusz Hiler
2019-08-26 13:57 ` Arkadiusz Hiler
1 sibling, 0 replies; 13+ messages in thread
From: Arkadiusz Hiler @ 2019-08-26 13:38 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
On Mon, Aug 26, 2019 at 04:12:47PM +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 +++++----------------------
> gitlab-ci/pull-or-rebuild.sh | 51 ++++++++++++++++++++++++++++++++++++
Please use `.gitlab-ci/` so it's consistent with .gitlab-ci.yml and what
others[0] are doing.
[0]: https://gitlab.freedesktop.org/mesa/mesa/tree/master/.gitlab-ci
--
Cheers,
Arek
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [igt-dev] [PATCH v3 5/6] gitlab-ci: rebuild images only on Dockerfile changes
2019-08-26 13:12 ` [igt-dev] [PATCH v3 5/6] gitlab-ci: rebuild images only on Dockerfile changes Oleg Vasilev
2019-08-26 13:38 ` Arkadiusz Hiler
@ 2019-08-26 13:57 ` Arkadiusz Hiler
1 sibling, 0 replies; 13+ messages in thread
From: Arkadiusz Hiler @ 2019-08-26 13:57 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
On Mon, Aug 26, 2019 at 04:12:47PM +0300, Oleg Vasilev wrote:
> diff --git a/gitlab-ci/pull-or-rebuild.sh b/gitlab-ci/pull-or-rebuild.sh
> new file mode 100755
> index 00000000..3bf9296f
> --- /dev/null
> +++ b/gitlab-ci/pull-or-rebuild.sh
> @@ -0,0 +1,51 @@
> +#!/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 / - )
The issue here is that ref may contain '/' (and it does for the CI
tags), so we have to do that translation here, but we cannot just use
CI_COMMIT_REF_NAME in the `image:` in the .gitlab-ci.yml.
I am fine with keeping the ref tags up to date, but I think we should
additionally use just the commit's SHA1 for tagging.
I think that we should tag the images in 3 ways:
a) dockerfile-$(sha1sum Dockerfile...)
b) commit-${CI_COMMIT_SHA}
c) $(echo ${CI_COMMIT_REF_NAME}-latest | tr / -)
We would use (a) for checking whether we have anything to build, and (b)
for `image:` in .gitlab-ci.yml. (c) is purely for human convenience.
--
Cheers,
Arek
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* [igt-dev] [PATCH v3 6/6] gitlab-ci: introduce containers with IGT inside
2019-08-26 13:12 [igt-dev] GitLab CI overhaul Oleg Vasilev
` (4 preceding siblings ...)
2019-08-26 13:12 ` [igt-dev] [PATCH v3 5/6] gitlab-ci: rebuild images only on Dockerfile changes Oleg Vasilev
@ 2019-08-26 13:12 ` Oleg Vasilev
2019-08-26 14:01 ` Arkadiusz Hiler
2019-08-26 14:39 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v3,1/6] gitlab-ci: move containers section to the top Patchwork
2019-08-26 18:08 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
7 siblings, 1 reply; 13+ messages in thread
From: Oleg Vasilev @ 2019-08-26 13:12 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 +++++++++++++++++++++++-
Dockerfile | 14 ++++++++++++++
gitlab-ci/docker-help.sh | 41 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+), 1 deletion(-)
create mode 100644 Dockerfile
create mode 100755 gitlab-ci/docker-help.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de334cf2..6e317b29 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/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..b23b4aef
--- /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
diff --git a/gitlab-ci/docker-help.sh b/gitlab-ci/docker-help.sh
new file mode 100755
index 00000000..0f0df179
--- /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 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.
+
+In order for devices to be available inside docker container, those either
+need to be mapped with --device or container needs to be run in --privileged
+mode.
+
+Contents of /opt/igt/libexec: $TEST_LIST
+PATH: $PATH
+LD_LIBRARY_PATH: $LD_LIBRARY_PATH
+IGT_TEST_ROOT: $IGT_TEST_ROOT
+END
--
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] 13+ messages in thread* Re: [igt-dev] [PATCH v3 6/6] gitlab-ci: introduce containers with IGT inside
2019-08-26 13:12 ` [igt-dev] [PATCH v3 6/6] gitlab-ci: introduce containers with IGT inside Oleg Vasilev
@ 2019-08-26 14:01 ` Arkadiusz Hiler
0 siblings, 0 replies; 13+ messages in thread
From: Arkadiusz Hiler @ 2019-08-26 14:01 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
On Mon, Aug 26, 2019 at 04:12:48PM +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 | 14 ++++++++++++++
> gitlab-ci/docker-help.sh | 41 ++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 79 insertions(+), 1 deletion(-)
> create mode 100644 Dockerfile
> create mode 100755 gitlab-ci/docker-help.sh
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index de334cf2..6e317b29 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/Dockerfile b/Dockerfile
> new file mode 100644
> index 00000000..b23b4aef
> --- /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
> diff --git a/gitlab-ci/docker-help.sh b/gitlab-ci/docker-help.sh
> new file mode 100755
> index 00000000..0f0df179
> --- /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 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.
in IGT_TEST_ROOT=$IGT_TEST_ROOT
with that and the ref changes menioned in the other emails - looks good to me
> +
> +In order for devices to be available inside docker container, those either
> +need to be mapped with --device or container needs to be run in --privileged
> +mode.
> +
> +Contents of /opt/igt/libexec: $TEST_LIST
> +PATH: $PATH
> +LD_LIBRARY_PATH: $LD_LIBRARY_PATH
> +IGT_TEST_ROOT: $IGT_TEST_ROOT
> +END
> --
> 2.23.0
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v3,1/6] gitlab-ci: move containers section to the top
2019-08-26 13:12 [igt-dev] GitLab CI overhaul Oleg Vasilev
` (5 preceding siblings ...)
2019-08-26 13:12 ` [igt-dev] [PATCH v3 6/6] gitlab-ci: introduce containers with IGT inside Oleg Vasilev
@ 2019-08-26 14:39 ` Patchwork
2019-08-26 18:08 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
7 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-08-26 14:39 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
== Series Details ==
Series: series starting with [v3,1/6] gitlab-ci: move containers section to the top
URL : https://patchwork.freedesktop.org/series/65798/
State : success
== Summary ==
CI Bug Log - changes from IGT_5150 -> IGTPW_3379
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/65798/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_3379 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@read_all_entries:
- fi-apl-guc: [PASS][1] -> [DMESG-WARN][2] ([fdo#103558] / [fdo#105602])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/fi-apl-guc/igt@debugfs_test@read_all_entries.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/fi-apl-guc/igt@debugfs_test@read_all_entries.html
* igt@gem_basic@create-fd-close:
- fi-icl-u3: [PASS][3] -> [DMESG-WARN][4] ([fdo#107724])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/fi-icl-u3/igt@gem_basic@create-fd-close.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/fi-icl-u3/igt@gem_basic@create-fd-close.html
* igt@gem_ctx_create@basic-files:
- fi-icl-u3: [PASS][5] -> [INCOMPLETE][6] ([fdo#107713] / [fdo#109100])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/fi-icl-u3/igt@gem_ctx_create@basic-files.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/fi-icl-u3/igt@gem_ctx_create@basic-files.html
#### Possible fixes ####
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [FAIL][7] ([fdo#103167]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/fi-icl-u2/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#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
Participating hosts (53 -> 45)
------------------------------
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_3379
CI-20190529: 20190529
CI_DRM_6785: f1f309b0b9d38667082d95904d7967f13fd2e274 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3379: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/
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_3379/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [v3,1/6] gitlab-ci: move containers section to the top
2019-08-26 13:12 [igt-dev] GitLab CI overhaul Oleg Vasilev
` (6 preceding siblings ...)
2019-08-26 14:39 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v3,1/6] gitlab-ci: move containers section to the top Patchwork
@ 2019-08-26 18:08 ` Patchwork
7 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-08-26 18:08 UTC (permalink / raw)
To: Oleg Vasilev; +Cc: igt-dev
== Series Details ==
Series: series starting with [v3,1/6] gitlab-ci: move containers section to the top
URL : https://patchwork.freedesktop.org/series/65798/
State : success
== Summary ==
CI Bug Log - changes from IGT_5150_full -> IGTPW_3379_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/65798/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_3379_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@reset-stress:
- shard-glk: [PASS][1] -> [FAIL][2] ([fdo#109661])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-glk6/igt@gem_eio@reset-stress.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-glk4/igt@gem_eio@reset-stress.html
* igt@gem_exec_schedule@independent-bsd2:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276]) +16 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb1/igt@gem_exec_schedule@independent-bsd2.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb5/igt@gem_exec_schedule@independent-bsd2.html
* igt@gem_exec_schedule@pi-ringfull-bsd:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#111325]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb5/igt@gem_exec_schedule@pi-ringfull-bsd.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb2/igt@gem_exec_schedule@pi-ringfull-bsd.html
* igt@i915_suspend@debugfs-reader:
- shard-apl: [PASS][7] -> [DMESG-WARN][8] ([fdo#108566]) +5 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-apl4/igt@i915_suspend@debugfs-reader.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-apl6/igt@i915_suspend@debugfs-reader.html
* igt@kms_cursor_crc@pipe-a-cursor-256x256-sliding:
- shard-apl: [PASS][9] -> [FAIL][10] ([fdo#103232])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-apl7/igt@kms_cursor_crc@pipe-a-cursor-256x256-sliding.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-apl7/igt@kms_cursor_crc@pipe-a-cursor-256x256-sliding.html
- shard-kbl: [PASS][11] -> [FAIL][12] ([fdo#103232])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-256x256-sliding.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-256x256-sliding.html
* igt@kms_cursor_legacy@cursor-vs-flip-atomic:
- shard-hsw: [PASS][13] -> [FAIL][14] ([fdo#103355])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-hsw2/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-hsw8/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: [PASS][15] -> [FAIL][16] ([fdo#105363])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-glk4/igt@kms_flip@flip-vs-expired-vblank.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-glk7/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103167]) +4 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109441]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb3/igt@kms_psr@psr2_sprite_mmap_gtt.html
* igt@sw_sync@sync_busy_fork_unixsocket:
- shard-apl: [PASS][21] -> [INCOMPLETE][22] ([fdo#103927]) +3 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-apl7/igt@sw_sync@sync_busy_fork_unixsocket.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-apl2/igt@sw_sync@sync_busy_fork_unixsocket.html
#### Possible fixes ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][23] ([fdo#110841]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb2/igt@gem_ctx_shared@exec-single-timeline-bsd.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb5/igt@gem_ctx_shared@exec-single-timeline-bsd.html
* igt@gem_eio@reset-stress:
- shard-snb: [FAIL][25] ([fdo#109661]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-snb1/igt@gem_eio@reset-stress.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-snb4/igt@gem_eio@reset-stress.html
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][27] ([fdo#110854]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb8/igt@gem_exec_balancer@smoke.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb2/igt@gem_exec_balancer@smoke.html
* igt@gem_exec_schedule@deep-bsd:
- shard-iclb: [SKIP][29] ([fdo#111325]) -> [PASS][30] +8 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb1/igt@gem_exec_schedule@deep-bsd.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb7/igt@gem_exec_schedule@deep-bsd.html
* igt@i915_selftest@mock_fence:
- shard-iclb: [INCOMPLETE][31] ([fdo#107713]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb7/igt@i915_selftest@mock_fence.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb7/igt@i915_selftest@mock_fence.html
* igt@kms_busy@basic-flip-b:
- shard-kbl: [DMESG-WARN][33] -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-kbl2/igt@kms_busy@basic-flip-b.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-kbl7/igt@kms_busy@basic-flip-b.html
- shard-apl: [DMESG-WARN][35] -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-apl7/igt@kms_busy@basic-flip-b.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-apl7/igt@kms_busy@basic-flip-b.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: [FAIL][37] ([fdo#103167]) -> [PASS][38] +4 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-apl: [DMESG-WARN][39] ([fdo#108566]) -> [PASS][40] +5 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-apl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-apl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
* igt@kms_psr@no_drrs:
- shard-iclb: [FAIL][41] ([fdo#108341]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb1/igt@kms_psr@no_drrs.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb7/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][43] ([fdo#109441]) -> [PASS][44] +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb3/igt@kms_psr@psr2_cursor_render.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][45] ([fdo#99912]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-apl2/igt@kms_setmode@basic.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-apl1/igt@kms_setmode@basic.html
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][47] ([fdo#109276]) -> [PASS][48] +18 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb3/igt@prime_busy@hang-bsd2.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb4/igt@prime_busy@hang-bsd2.html
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [FAIL][49] ([fdo#111329]) -> [SKIP][50] ([fdo#109276])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb4/igt@gem_ctx_isolation@vcs1-nonpriv.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb8/igt@gem_ctx_isolation@vcs1-nonpriv.html
* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: [FAIL][51] ([fdo#111330]) -> [SKIP][52] ([fdo#109276]) +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb4/igt@gem_mocs_settings@mocs-settings-bsd2.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb3/igt@gem_mocs_settings@mocs-settings-bsd2.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][53] ([fdo#109349]) -> [DMESG-WARN][54] ([fdo#107724])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5150/shard-iclb8/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[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#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 6)
------------------------------
Missing (1): shard-skl
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5150 -> IGTPW_3379
CI-20190529: 20190529
CI_DRM_6785: f1f309b0b9d38667082d95904d7967f13fd2e274 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3379: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3379/
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_3379/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread