From f447d05f872e7de120a879559ad60b3a39088cf7 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Fri, 30 Nov 2018 14:07:56 +0100
Subject: [PATCH] [nrf noup] ci: NCS-specific CI tweaks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Necessary changes for NCS CI.

- Add a Jenkinsfile
- Add a commit-tags workflow: This enables sauce tag checking in sdk-zephyr
- compliance.yml: Disable check for merge commits, since we have upmerges
downstream. Also, since in the code we refer to Kconfig symbols that are defined
in the sdk-nrf repository, most Kconfig checks will not pass so exclude them.
Also, disable any maintainers-related checks
- scripts/gitlint: Extend the max commit line lengths for Gitlint to account
for sauce tags
- Adapt to the changes in:
https://github.com/nrfconnect/action-commit-tags/pull/4

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit ef75b3e9cc4d05bef72ec6fcce1f3bec5add5d23)
(cherry picked from commit 6692263072e247f5eef7fb41bb1ee46e56fa7fbe)
---
 .github/workflows/commit-tags.yml      | 28 ++++++++++++++++++++++++++
 .github/workflows/compliance.yml       |  5 +++--
 Jenkinsfile                            |  5 +++++
 scripts/gitlint/zephyr_commit_rules.py |  4 ++--
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/commit-tags.yml
 create mode 100644 Jenkinsfile

diff --git a/.github/workflows/commit-tags.yml b/.github/workflows/commit-tags.yml
new file mode 100644
index 00000000000..828f0297167
--- /dev/null
+++ b/.github/workflows/commit-tags.yml
@@ -0,0 +1,28 @@
+name: Commit tags
+
+on:
+  pull_request:
+    types: [synchronize, opened, reopened, edited, labeled, unlabeled,
+            milestoned, demilestoned, assigned, unassigned, ready_for_review,
+            review_requested]
+
+jobs:
+  commit_tags:
+    runs-on: ubuntu-22.04
+    name: Run commit tags checks on patch series (PR)
+    steps:
+    - name: Update PATH for west
+      run: |
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Checkout the code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+
+    - name: Run the commit tags
+      uses: nrfconnect/action-commit-tags@main
+      with:
+        target: .
+        upstream: zephyrproject-rtos/zephyr/main
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
index 1875de7cb7e..0346dec4bbc 100644
--- a/.github/workflows/compliance.yml
+++ b/.github/workflows/compliance.yml
@@ -31,8 +31,8 @@ jobs:
         git config --global user.name "Your Name"
         git remote -v
         # Ensure there's no merge commits in the PR
-        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        (echo "::error ::Merge commits not allowed, rebase instead";false)
+        #[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
+        #(echo "::error ::Merge commits not allowed, rebase instead";false)
         rm -fr ".git/rebase-apply"
         rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
@@ -83,6 +83,7 @@ jobs:
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
         ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat \
+        -e Kconfig -e KconfigBasicNoModules -e SysbuildKconfig -e SysbuildKconfigBasicNoModules -e ModulesMaintainers \
         -c origin/${BASE_REF}..
 
     - name: upload-results
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000000..3b9cf002239
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,5 @@
+@Library("CI_LIB") _
+
+def pipeline = new ncs.sdk_zephyr.Main()
+
+pipeline.run(JOB_NAME)
diff --git a/scripts/gitlint/zephyr_commit_rules.py b/scripts/gitlint/zephyr_commit_rules.py
index a2c9cd3cb7f..ef317e22684 100644
--- a/scripts/gitlint/zephyr_commit_rules.py
+++ b/scripts/gitlint/zephyr_commit_rules.py
@@ -78,7 +78,7 @@ class TitleMaxLengthRevert(LineRule):
     name = "title-max-length-no-revert"
     id = "UC5"
     target = CommitMessageTitle
-    options_spec = [IntOption('line-length', 75, "Max line length")]
+    options_spec = [IntOption('line-length', 120, "Max line length")]
     violation_message = "Commit title exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):
@@ -103,7 +103,7 @@ class MaxLineLengthExceptions(LineRule):
     name = "max-line-length-with-exceptions"
     id = "UC4"
     target = CommitMessageBody
-    options_spec = [IntOption('line-length', 75, "Max line length")]
+    options_spec = [IntOption('line-length', 120, "Max line length")]
     violation_message = "Commit message body line exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):