From 9d64954bcb525918565de51e3c8c8aa9da311ac5 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 19 Oct 2022 17:15:01 +0200 Subject: [PATCH] docs: Gitlab -> GitLab While we're at it, also fixup a single case of "Ci" -> "CI" Reviewed-by: David Heidelberg Part-of: --- docs/ci/index.rst | 10 +++++----- docs/ci/kernel.rst | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/ci/index.rst b/docs/ci/index.rst index 4ffab9cbe94..db1124efd0f 100644 --- a/docs/ci/index.rst +++ b/docs/ci/index.rst @@ -84,7 +84,7 @@ added to the OPA policy for the MinIO repository as per https://gitlab.freedesktop.org/freedesktop/helm-gitlab-config/-/commit/a3cd632743019f68ac8a829267deb262d9670958 . So the jobs are created in personal repositories, the name of the user's account needs -to be added to the rules attribute of the Gitlab CI job that accesses the restricted +to be added to the rules attribute of the GitLab CI job that accesses the restricted accounts. .. toctree:: @@ -252,7 +252,7 @@ directory. You can hack on mesa and iterate testing the build with: Conformance Tests ----------------- -Some conformance tests require a special treatment to be maintained on Gitlab CI. +Some conformance tests require a special treatment to be maintained on GitLab CI. This section lists their documentation pages. .. toctree:: @@ -261,11 +261,11 @@ This section lists their documentation pages. skqp -Updating Gitlab CI Linux Kernel +Updating GitLab CI Linux Kernel ------------------------------- -Gitlab CI usually runs a bleeding-edge kernel. The following documentation has -instructions on how to uprev Linux Kernel in the Gitlab Ci ecosystem. +GitLab CI usually runs a bleeding-edge kernel. The following documentation has +instructions on how to uprev Linux Kernel in the GitLab CI ecosystem. .. toctree:: :maxdepth: 1 diff --git a/docs/ci/kernel.rst b/docs/ci/kernel.rst index fa765cf0c65..8afe3f1435a 100644 --- a/docs/ci/kernel.rst +++ b/docs/ci/kernel.rst @@ -1,16 +1,16 @@ Upreving Linux Kernel ===================== -Occasionally, the Gitlab CI needs a Linux Kernel update to enable new kernel +Occasionally, the GitLab CI needs a Linux Kernel update to enable new kernel features, device drivers, bug fixes etc to CI jobs. -Kernel uprevs in Gitlab CI are relatively simple, but prone to lots of +Kernel uprevs in GitLab CI are relatively simple, but prone to lots of side-effects since many devices from different platforms are involved in the pipeline. Kernel repository ----------------- -The Linux Kernel used in the Gitlab CI is stored at the following repository: +The Linux Kernel used in the GitLab CI is stored at the following repository: https://gitlab.freedesktop.org/gfx-ci/linux It is common that Mesa kernel brings some patches that were not merged on the @@ -63,7 +63,7 @@ Every kernel uprev should update 3 image tags, located at two files. :code:`.gitlab-ci/image-tags.yml` tags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - **KERNEL_ROOTFS_TAG** to rebuild rootfs with the new kernel -- **DEBIAN_X86_TEST_GL_TAG** to ensure that the new rootfs is being used by the Gitlab x86 jobs +- **DEBIAN_X86_TEST_GL_TAG** to ensure that the new rootfs is being used by the GitLab x86 jobs Development routine ------------------- @@ -71,7 +71,7 @@ Development routine 1. Compile the newer kernel locally for each platform. 2. Compile device trees for ARM platforms 3. Update Kconfigs. Are new Kconfigs necessary? Is CONFIG_XYZ_BLA deprecated? Does the `merge_config.sh` override an important config? -4. Push a new development branch to `Kernel repository`_ based on the latest kernel tag used in Gitlab CI +4. Push a new development branch to `Kernel repository`_ based on the latest kernel tag used in GitLab CI 5. Hack `build-kernel.sh` script to clone kernel from your development branch 6. Update image tags. See `Updating image tags`_ 7. Run the entire CI pipeline, all the automatic jobs should be green. If some job is red or taking too long, you will need to investigate it and probably ask for help.