[Mesa-dev] [PATCH 2/3] panfrost: Make the gitlab-ci.yml file more robust

Rohan Garg rohan.garg at collabora.com
Thu Jun 20 13:58:48 UTC 2019


This enables developers to add packages to the container
when working on their own branches by creating
a container tag which features the branch name.
Dropped the IMAGE_LOCAL variable since I did not see it being
used anywhere.
---
 src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
index 887c93dbc8b..7be53d623d6 100644
--- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
@@ -16,7 +16,8 @@
 variables:
   UPSTREAM_REPO: mesa/mesa
   DEBIAN_VERSION: testing-slim
-  DEBIAN_TAG: "2019-06-17-1"
+  REV: 2019-06-17-1
+  DEBIAN_TAG: "${CI_COMMIT_REF_SLUG}_${DEBIAN_ARCH}_${REV}"
 
 include:
   - project: 'wayland/ci-templates'
@@ -42,7 +43,6 @@ stages:
   <<: *retry
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    IMAGE_LOCAL: "$CI_REGISTRY/$CI_PROJECT_PATH/${DEBIAN_ARCH}:latest"
     DEBIAN_EXEC: 'DEBIAN_ARCH=${DEBIAN_ARCH}
                   GCC_ARCH=${GCC_ARCH}
                   KERNEL_ARCH=${KERNEL_ARCH}
@@ -73,7 +73,7 @@ container:arm64:
 
 .build:
   stage: build
-  image: $CI_REGISTRY/$CI_PROJECT_PATH/${DEBIAN_ARCH}:latest
+  image: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
   cache:
     paths:
       - ccache
-- 
2.17.1



More information about the mesa-dev mailing list