[igt-dev] [PATCH v3 2/6] gitlab-ci: rename igt-* container to build-*

Oleg Vasilev oleg.vasilev at intel.com
Mon Aug 26 13:12:44 UTC 2019 

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 at 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

More information about the igt-dev mailing list