Skip to content

Commit

Permalink
update other docs to use jenkins_node name
Browse files Browse the repository at this point in the history
  • Loading branch information
evgeni committed Mar 1, 2024
1 parent 6841d53 commit bd2ac80
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Foreman Infrastructure

This repo contains puppet modules that are used to manage infrastructure used by the Foreman project. These modules manage many different pieces of software, including Jenkins build slaves, package build machines, the Jenkins frontend, as well as an internal Foreman instance and puppetserver.
This repo contains puppet modules that are used to manage infrastructure used by the Foreman project. These modules manage many different pieces of software, including Jenkins nodes, package build machines, the Jenkins frontend, as well as an internal Foreman instance and puppetserver.

View the [documentation](https://theforeman.github.io/foreman-infra).

Expand Down
2 changes: 1 addition & 1 deletion docs/gpg.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ To make our infrastructure aware of the new keys:
* Configure it in `puppet/modules/freight/templates/freight.conf.erb`, examples:
* [7680053](https://github.com/theforeman/foreman-infra/commit/7680053) - Add 2016 archive key, thus using two keys for a period of time
* [9f50f62](https://github.com/theforeman/foreman-infra/commit/9f50f62) - Remove 2014 archive signing GPG key
* Configure it in `puppet/modules/slave/files/pbuilder_F60addforemanrepo`, example:
* Configure it in `puppet/modules/jenkins_node/files/pbuilder_F60addforemanrepo`, example:
* [596ece6](https://github.com/theforeman/foreman-infra/commit/596ece6) - add new (2021) key to pbuilder

To make our users aware of the new keys:
Expand Down
4 changes: 2 additions & 2 deletions docs/jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ To get an account, open a new topic on [Foreman Infra SIG](https://community.the
CentOS offer access to their [QA CI infrastructure](https://wiki.centos.org/QaWiki/CI) to Foreman and other projects, which gives on-demand access to run tests on physical hardware running CentOS. It consists of three main components:

* [ci.centos.org](https://ci.centos.org) - a Jenkins instance which we can manage jobs on
* foreman@slave01 - a user account on a slave which our jobs all run on
* foreman@slave01 - a user account on a node which our jobs all run on
* [Duffy](https://wiki.centos.org/QaWiki/CI/Duffy) - on-demand provisioning of physical test servers running CentOS, available from foreman@slave01 jobs

Getting help:
Expand All @@ -38,7 +38,7 @@ For detailed information see [Jenkins Job README](https://github.com/theforeman/

### Configuration management

All nodes are maintained through our own Foreman instance using Puppet. The Foreman instance has a host group called "Builders" and "Builders/Debian" which have the "slave" and other classes assigned to them. Debian machines have additional permissions to push Debian packages.
All nodes are maintained through our own Foreman instance using Puppet. The Foreman instance has a host group called "Builders" and "Builders/Debian" which have the "jenkins_node" and other classes assigned to them. Debian machines have additional permissions to push Debian packages.

https://github.com/theforeman/foreman-infra/tree/master/puppet/modules contains the source for all Puppet modules.

Expand Down

0 comments on commit bd2ac80

Please sign in to comment.