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

Tomeu Vizoso tomeu.vizoso at collabora.com
Thu Jun 20 14:27:17 UTC 2019


On Thu, 20 Jun 2019 at 15:59, Rohan Garg <rohan.garg at collabora.com> wrote:
>
> 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.

Not sure I understand how this works. Isn't this going to cause
unnecessary container builds?

And, why cannot developers just add whatever they want to DEBIAN_TAG
to that end?

> Dropped the IMAGE_LOCAL variable since I did not see it being
> used anywhere.

Cool.

Thanks,

Tomeu

> ---
>  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
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list