diff --git a/doc/build/docker.rst b/doc/build/docker.rst index 5896dd5ac4a..ca3d1402b3e 100644 --- a/doc/build/docker.rst +++ b/doc/build/docker.rst @@ -1,5 +1,7 @@ -GitLab CI / U-Boot runner container -=================================== +U-Boot runner container +======================= + +See also :doc:`/develop/ci_testing`. In order to have a reproducible and portable build environment for CI we use a container for building in. This means that developers can also reproduce the CI environment, to a large degree at least, locally. This file is located in the tools/docker directory. diff --git a/doc/develop/ci_testing.rst b/doc/develop/ci_testing.rst index ffaacedc3d8..faeec1dd8b8 100644 --- a/doc/develop/ci_testing.rst +++ b/doc/develop/ci_testing.rst @@ -40,7 +40,24 @@ then the "Checks" tab will show the results. GitLab CI Pipelines ------------------- -This pipeline is defined in the top-level ``.gitlab-ci.yml`` file. Currently, +`Gitlab `_ is used for building and testing U-Boot. There +are two separate instances: + + - `Denx `_ - main tree, including custodian trees + - `Concept `_ - concept tree + +This pipeline is defined in the top-level ``.gitlab-ci.yml`` file. + +To push to Gitlab without triggering a pipeline use: + +.. code-block:: bash + + git push -o ci.skip + +Denx +~~~~ + +Currently with the main tree, we support running GitLab CI pipelines only for custodians, due to the resources the project has available. For Custodians, it is a matter of enabling the pipeline feature in your project repository following the standard @@ -50,11 +67,14 @@ runners you are able to provide. While it is intended to be able to run this pipeline on the free public instances provided at https://gitlab.com/ a problem with our squashfs tests currently prevents this. -To push to Gitlab without triggering a pipeline use: +Concept +~~~~~~~ -.. code-block:: bash - - git push -o ci.skip +Contributors can request a login at `U-Boot Concept `_ +(after sending an email to Simon Glass as shown there). +Contributors are then able to push branches and trigger a CI run. The +``.gitlab-ci.yml`` is slightly different from the main tree and CI runs +are generally twice as fast to complete. Docker container ----------------