Merge branch 'automake' into 'main'

Automatically redeploy changes to owners.yaml

See merge request redhat/centos-stream/src/kernel/documentation!635

Author: Jiri Benc

.gitlab-ci.yml

@@ -6,7 +6,7 @@ stages:
   - container prep
   - sanity check
   - build
-  - check
+  - deploy 
 
 # https://docs.gitlab.com/ee/ci/yaml/README.html#switch-between-branch-pipelines-and-merge-request-pipelines
 # if a MR is opened: run a detached MR pipeline
@@ -81,12 +81,13 @@ build:
     - .fdo.distribution-image@alpine
     - .common_variables
   script:
-    - cd scripts
+    # call make at root directory to do a 'fullbuild'
     - make
   artifacts:
     paths:
-      - scripts/yaml2CODEOWNERS
-      - scripts/yaml2RHMAINTAINERS
+      - info/RHMAINTAINERS
+      - info/CODEOWNERS
+      - info/owners.yaml
 
 .pages:
   stage: build
@@ -113,6 +114,8 @@ build:
     - public
 
 pages CI check:
+  # This stage, while still "deploying" a gitlab pages instance, does *not* run
+  # on the `main` branch.
   extends:
   - .pages
   before_script:
@@ -126,40 +129,31 @@ pages CI check:
       when: never
     - when: on_success
 
-check:
-  stage: check
+deploy:
+  stage: deploy 
+  dependencies:
+    - build
   extends:
     - .fdo.distribution-image@alpine
     - .common_variables
   script:
-    # rebuild the current files
-    - make
-
-    # clean up cache
-    - rm -f .failed
+    # we've already run 'make' and the artifacts are available.
+    # so just deploy code to main
+    - git config user.name "Gitlab Runner"
+    - git config user.email ""
+    - git add info/owners.yaml info/RHMAINTAINERS info/CODEOWNERS
+    - git commit -m "[Gitlab CI/CD] Automated rebuild of info/*"
+    - git push https://gitlab-ci-token:$MAKE_MAINT@gitlab.com/redhat/centos-stream/src/kernel/documentation.git '$CI_DEFAULT_BRANCH'
 
-    # check that the committed files matched
-    - git diff --exit-code || touch .failed
-    - |
-      if [[ -e .failed ]]
-      then
-        echo '-----------------------------------------------------------------'
-        echo ''
-        echo ' Looks like the files scripts/CODEOWNERS or scripts/RHMAINTAINERS'
-        echo ' have not been regenerated and checked in this commit.'
-        echo ''
-        echo ' Please run the following command before committing:'
-        echo '        ./scripts/yaml2CODEOWNERS info/owners.yaml > info/CODEOWNERS'
-        echo '        ./scripts/yaml2RHMAINTAINERS info/owners.yaml > info/RHMAINTAINERS'
-        echo ''
-        echo '-----------------------------------------------------------------'
-        exit 1
-      fi
+  rules:
+    - if: '$CI_PROJECT_NAMESPACE == "redhat/centos-stream/src/kernel" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - changes:
+      - info/owners.yaml
 
 pages:
   extends:
   - .pages
-  stage: check
+  stage: deploy 
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    - when: never
+    - if: '$CI_PROJECT_NAMESPACE == "redhat/centos-stream/src/kernel" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+

README.md

@@ -43,15 +43,8 @@ accompanied by a description of the modifications.  In most cases, a simple
 explanation will do (for example, "Update x86 maintainers"), however the
 maintainers may ask for a more detailed write-up.
 
-Standalone changes are NOT accepted for the RHMAINTAINERS or CODEOWNERS files,
-and changes are only accepted for the owners.yaml file.  Merge requests that
-modify owners.yaml changes must include associated changes to RHMAINTAINERS &
-CODEOWNERS.  These secondary files can be generated using these commands
-executed from the top level of documentation:
-
-```
-	make # requires minimum golang version 1.14
-```
+Changes are only accepted for the owners.yaml file, as the RHMAINTAINERS and
+CODEOWNERS files are generated automatically on-merge.
 
 Users making changes must include a "Signed-off-by:" tag on all commits that
 acknowledges the DCO, https://developercertificate.org.