Re: [igt-dev] [PATCH v2 3/3] gitlab-ci: introduce final containers

Vasilev, Oleg
2019-08-23T12:41:07Z

[-- Attachment #1.1: Type: text/plain, Size: 2002 bytes --]

On Thu, 2019-08-22 at 11:45 +0300, Arkadiusz Hiler wrote:
> On Tue, Aug 20, 2019 at 04:19:36PM +0300, Oleg Vasilev wrote:
...
> >
> > +############## FINAL CONTAINERS ####################
> > +
> > +
> > +final-containers:igt-final:
>
> I am sceptical about having it named igt-final.
>
> How about just igt-x86_64?
>
> If you need further clarification on what people should use then you
> can
> add "build-env-" to the name of the *base* images.
Hi,

I could rename igt-final to igt and igt-* to igt-base-*. Would it break
any preexiting automatization?

>
> > + stage: final-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/igt-fedora
> > + - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora igt-
> > fedora
> > + - scripts/pull-or-rebuild.sh Dockerfile.final igt-final
> > diff --git a/Dockerfile.final b/Dockerfile.final
> > new file mode 100644
> > index 00000000..214a5c20
> > --- /dev/null
> > +++ b/Dockerfile.final
> > @@ -0,0 +1,16 @@
> > +# Version number to bump for force image rebuild: 0
> > +FROM igt-fedora
> > +
> > +RUN dnf install -y findutils && \
> > + dnf clean all
> > +
> > +COPY opt-igt /opt/igt
> > +COPY scripts/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"
> > +
> > +COPY scripts/docker-help.sh /usr/local/bin/docker-help.sh
>
> I would also put this one in .gitlab-ci/

This not technically CI-related, but docker-related. Why not leave it
in scripts/?

Oleg

[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3261 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]