From b700ead6cab4727bd3e746e481375882a07107e8 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Aug 07 2023 09:30:49 +0000 Subject: Update CI docs --- diff --git a/docs/internal/ci.md b/docs/internal/ci.md index 1b47835..2bb320e 100644 --- a/docs/internal/ci.md +++ b/docs/internal/ci.md @@ -1,29 +1,21 @@ # CI -SIG members can request access to the CentOS -[OpenShift](https://console-openshift-console.apps.ocp.ci.centos.org/topology/ns/hyperscale) -instance to run CI/CD jobs as needed. +SIG members can access the [Gitlab](https://gitlab.com/CentOS/Hyperscale/) +instance to run CI/CD jobs as needed. A repository can be configured with a +.gitlab-ci.yml file to configure pipelines to run. See the Gitlab CI +[docs](https://docs.gitlab.com/ee/ci/) for more information. -OpenShift can be configured either via the UI or via the "oc" CLI. The CLI is -not packaged but can be downloaded [here](https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz). +Currently we're running: -To use the CLI, you'll need to login first. You can get the required token via -the UI. First, login to OpenShift, then click on your username in the top right -corner and click "copy login command", you'll then get a CLI command that you -can use to login using the CLI. +- systemd-cd: a periodic task to kick off builds on + [CBS](https://cbs.centos.org/koji/userinfo?userID=255) + for systemd based off the latest git changes. This job is executed from the + [systemd-releng](https://gitlab.com/CentOS/Hyperscale/releng/systemd-releng) + repository. Manual runs can be triggered + [here](https://gitlab.com/CentOS/Hyperscale/releng/systemd-releng/-/pipeline_schedules) -Currently we're running: +## Openshift -- [systemd-git-update](https://pagure.io/centos-sig-hyperscale/systemd-releng/blob/main/f/systemd-git-update), - a periodic task to keep our - [systemd repo](https://pagure.io/centos-sig-hyperscale/systemd) in sync with - [upstream](https://github.com/systemd/systemd). To update to a new version, - run `oc start-build systemd-git-update --from-repo .` from the root of the - systemd-releng repository. -- [systemd-cd](https://pagure.io/centos-sig-hyperscale/systemd-releng/blob/main/f/systemd-cd), - a periodic task to kick off - [builds on CBS](https://cbs.centos.org/koji/userinfo?userID=255) - for systemd based off the latest git changes. To update to a new version, - run `oc start-build systemd-cd --from-repo .` from the root of the - systemd-releng repository. -- a Jenkins instance that is currently unused +SIG members can also request access to the CentOS +[OpenShift](https://console-openshift-console.apps.ocp.ci.centos.org/topology/ns/hyperscale) +instance to run jobs if needed. \ No newline at end of file diff --git a/docs/internal/systemd.md b/docs/internal/systemd.md index 7ede091..2e5b5fd 100644 --- a/docs/internal/systemd.md +++ b/docs/internal/systemd.md @@ -44,9 +44,6 @@ Steps: Hyperscale release branch into the Meta specific release branch and then do any Meta specific backports. - Add new entries to the BACKPORTS file for the new release branches, along with links to all the backports. - Push the branches to the pagure remote. -- When backporting PRs that haven't been merged upstream yet, update systemd-git-update and systemd-cd in the systemd-releng - repository as well. Update systemd-git-update to pull the upstream PR and mirror it to a branch on the pagure remote. Update - systemd-cd to merge the mirror branch into the main branch when running the CI. The new release branches are now ready to be used in the RPM spec. See the next section on how to do a new release for the RPM spec.