Skip to content

Commit 61fb368

Browse files
zampierilucaszampierilucas
committed
Merge commit 'e75b18b18f451107c35b5241562f760e27d159d3'
2 parents 3aa6715 + e75b18b commit 61fb368

File tree

5 files changed

+64
-43
lines changed

5 files changed

+64
-43
lines changed

‎redhat/rhdocs/.gitlab-ci.yml‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ stages:
66
- container prep
77
- sanity check
88
- build
9-
- deploy
9+
- check
1010

1111
# https://docs.gitlab.com/ee/ci/yaml/README.html#switch-between-branch-pipelines-and-merge-request-pipelines
1212
# if a MR is opened: run a detached MR pipeline
@@ -81,13 +81,12 @@ build:
8181
- .fdo.distribution-image@alpine
8282
- .common_variables
8383
script:
84-
# call make at root directory to do a 'fullbuild'
84+
- cd scripts
8585
- make
8686
artifacts:
8787
paths:
88-
- info/RHMAINTAINERS
89-
- info/CODEOWNERS
90-
- info/owners.yaml
88+
- scripts/yaml2CODEOWNERS
89+
- scripts/yaml2RHMAINTAINERS
9190

9291
.pages:
9392
stage: build
@@ -114,8 +113,6 @@ build:
114113
- public
115114

116115
pages CI check:
117-
# This stage, while still "deploying" a gitlab pages instance, does *not* run
118-
# on the `main` branch.
119116
extends:
120117
- .pages
121118
before_script:
@@ -129,33 +126,40 @@ pages CI check:
129126
when: never
130127
- when: on_success
131128

132-
deploy:
133-
stage: deploy
134-
dependencies:
135-
- build
129+
check:
130+
stage: check
136131
extends:
137132
- .fdo.distribution-image@alpine
138133
- .common_variables
139134
script:
140-
# we've already run 'make' and the artifacts are available.
141-
# so just deploy code to main
142-
- git config user.name "Gitlab Runner"
143-
- git config user.email ""
144-
- git fetch origin
145-
- git add info/owners.yaml info/RHMAINTAINERS info/CODEOWNERS
146-
# make it so that job will not fail if there is nothing to commit
147-
- git diff-index --quiet HEAD || git commit -m "[Gitlab CI/CD] Automated rebuild of info/*"
148-
- git push https://gitlab-ci-token:$MAKE_MAINT@gitlab.com/redhat/centos-stream/src/kernel/documentation.git HEAD:main
135+
# rebuild the current files
136+
- make
149137

150-
rules:
151-
- if: '$CI_PROJECT_NAMESPACE == "redhat/centos-stream/src/kernel" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
152-
- changes:
153-
- info/owners.yaml
138+
# clean up cache
139+
- rm -f .failed
140+
141+
# check that the committed files matched
142+
- git diff --exit-code || touch .failed
143+
- |
144+
if [[ -e .failed ]]
145+
then
146+
echo '-----------------------------------------------------------------'
147+
echo ''
148+
echo ' Looks like the files scripts/CODEOWNERS or scripts/RHMAINTAINERS'
149+
echo ' have not been regenerated and checked in this commit.'
150+
echo ''
151+
echo ' Please run the following command before committing:'
152+
echo ' ./scripts/yaml2CODEOWNERS info/owners.yaml > info/CODEOWNERS'
153+
echo ' ./scripts/yaml2RHMAINTAINERS info/owners.yaml > info/RHMAINTAINERS'
154+
echo ''
155+
echo '-----------------------------------------------------------------'
156+
exit 1
157+
fi
154158
155159
pages:
156160
extends:
157161
- .pages
158-
stage: deploy
162+
stage: check
159163
rules:
160-
- if: '$CI_PROJECT_NAMESPACE == "redhat/centos-stream/src/kernel" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
161-
164+
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
165+
- when: never

‎redhat/rhdocs/README.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,15 @@ accompanied by a description of the modifications. In most cases, a simple
4343
explanation will do (for example, "Update x86 maintainers"), however the
4444
maintainers may ask for a more detailed write-up.
4545

46-
Changes are only accepted for the owners.yaml file, as the RHMAINTAINERS and
47-
CODEOWNERS files are generated automatically on-merge.
46+
Standalone changes are NOT accepted for the RHMAINTAINERS or CODEOWNERS files,
47+
and changes are only accepted for the owners.yaml file. Merge requests that
48+
modify owners.yaml changes must include associated changes to RHMAINTAINERS &
49+
CODEOWNERS. These secondary files can be generated using these commands
50+
executed from the top level of documentation:
51+
52+
```
53+
make # requires minimum golang version 1.14
54+
```
4855

4956
Users making changes must include a "Signed-off-by:" tag on all commits that
5057
acknowledges the DCO, https://developercertificate.org.

‎redhat/rhdocs/info/CODEOWNERS‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,10 @@ drivers/misc/ dledford@redhat.com prarit@redhat.com
361361
include/linux/miscdevice.h dledford@redhat.com prarit@redhat.com
362362

363363
^[CIFS FILESYSTEM]
364-
fs/cifs/ bcodding@redhat.com jlayton@redhat.com steved@redhat.com smayhew@redhat.com
365-
fs/smb/client/ bcodding@redhat.com jlayton@redhat.com steved@redhat.com smayhew@redhat.com
366-
fs/smb/common/ bcodding@redhat.com jlayton@redhat.com steved@redhat.com smayhew@redhat.com
367-
include/uapi/linux/cifs/ bcodding@redhat.com jlayton@redhat.com steved@redhat.com smayhew@redhat.com
364+
fs/cifs/ paalcant@redhat.com
365+
fs/smb/client/ paalcant@redhat.com
366+
fs/smb/common/ paalcant@redhat.com
367+
include/uapi/linux/cifs/ paalcant@redhat.com
368368

369369
^[CISCO FCOE HBA (fnic)]
370370
drivers/scsi/fnic/ cleech@redhat.com
@@ -1115,8 +1115,8 @@ tools/testing/selftests/pid_namespace/ agladkov@redhat.com
11151115
tools/testing/selftests/rlimits/ agladkov@redhat.com
11161116

11171117
^[NATIVE LANGUAGE SUPPORT]
1118-
include/linux/nls.h bcodding@redhat.com jlayton@redhat.com steved@redhat.com smayhew@redhat.com
1119-
fs/nls/ bcodding@redhat.com jlayton@redhat.com steved@redhat.com smayhew@redhat.com
1118+
include/linux/nls.h paalcant@redhat.com
1119+
fs/nls/ paalcant@redhat.com
11201120

11211121
^[NETFILTER]
11221122
Documentation/networking/ipvs-sysctl.* fwestpha@redhat.com

‎redhat/rhdocs/info/RHMAINTAINERS‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -680,10 +680,11 @@ F: drivers/misc/
680680
F: include/linux/miscdevice.h
681681

682682
CIFS FILESYSTEM
683-
M: Benjamin Coddington <bcodding@redhat.com>
684-
M: Jeffrey Layton <jlayton@redhat.com>
685-
M: Steve Dickson <steved@redhat.com>
686-
M: Scott Mayhew <smayhew@redhat.com>
683+
M: Paulo Alcantara <paalcant@redhat.com>
684+
R: Benjamin Coddington <bcodding@redhat.com>
685+
R: Jeffrey Layton <jlayton@redhat.com>
686+
R: Steve Dickson <steved@redhat.com>
687+
R: Scott Mayhew <smayhew@redhat.com>
687688
S: Supported
688689
F: fs/cifs/
689690
F: fs/smb/client/
@@ -1913,10 +1914,11 @@ F: tools/testing/selftests/pid_namespace/
19131914
F: tools/testing/selftests/rlimits/
19141915

19151916
NATIVE LANGUAGE SUPPORT
1916-
M: Benjamin Coddington <bcodding@redhat.com>
1917-
M: Jeffrey Layton <jlayton@redhat.com>
1918-
M: Steve Dickson <steved@redhat.com>
1919-
M: Scott Mayhew <smayhew@redhat.com>
1917+
M: Paulo Alcantara <paalcant@redhat.com>
1918+
R: Benjamin Coddington <bcodding@redhat.com>
1919+
R: Jeffrey Layton <jlayton@redhat.com>
1920+
R: Steve Dickson <steved@redhat.com>
1921+
R: Scott Mayhew <smayhew@redhat.com>
19201922
S: Supported
19211923
F: include/linux/nls.h
19221924
F: fs/nls/

‎redhat/rhdocs/info/owners.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,6 +1732,10 @@ subsystems:
17321732
- rhel-sst-filesystems
17331733
requiredApproval: false
17341734
maintainers:
1735+
- name: Paulo Alcantara
1736+
email: paalcant@redhat.com
1737+
gluser: paalcant
1738+
reviewers:
17351739
- name: Benjamin Coddington
17361740
email: bcodding@redhat.com
17371741
gluser: bcodding
@@ -4974,6 +4978,10 @@ subsystems:
49744978
- rhel-sst-filesystems
49754979
requiredApproval: false
49764980
maintainers:
4981+
- name: Paulo Alcantara
4982+
email: paalcant@redhat.com
4983+
gluser: paalcant
4984+
reviewers:
49774985
- name: Benjamin Coddington
49784986
email: bcodding@redhat.com
49794987
gluser: bcodding

0 commit comments

Comments
 (0)