Merge branch 'origin/release-2020' into merge-2020-into-2021

[alexxy/gromacs.git] / docs / dev-manual / releng / index.rst

diff --git a/docs/dev-manual/releng/index.rst b/docs/dev-manual/releng/index.rst
index 74272b9ab7414af2538cf3ebf7d88a1b9bd243a2..5b9ccdade4d23b1b6c83e7810dc6d10cbbfeaf53 100644 (file)
--- a/docs/dev-manual/releng/index.rst
+++ b/docs/dev-manual/releng/index.rst
@@ -3,23 +3,25 @@
 
 .. _releng-workflow-release:
 
-Release engineering with Gitlab
+Release engineering with GitLab
 ===============================
 
 .. toctree::
    :hidden:
 
-We are currently switching our build and testing system to use Gitlab
-CI pipelines run on GitLab Runner. This section is going to be extended
-with individual build information as it comes available. For now we are
-using a combination of building with the previous system on Jenkins
-and post-submit verification on Gitlab.
+We are currently switching our build and testing system to use GitLab
+and the integrated CI system, with information for the general system found
+in the official `GitLab documentation <https://docs.gitlab.com/ee/ci/yaml/>`_.
+The new configuration for the builds and tests can be found in the file
+``.gitlab-ci.yml``, with the templates for configuring is found in the files in the
+``admin/ci-templates/`` directory. This section is going to be extended
+with individual build information as it comes available.
 
 .. seealso:: :doc:`../infrastructure`
 
 .. _releng-triggering-builds:
 
-Triggering builds on Gitlab
+Triggering builds on GitLab
 ---------------------------
 
 Pipelines can be triggered through the web interface, with different