Merge "Support sonarcloud in python projects"

diff --git a/docs/jjb/lf-python-jobs.rst b/docs/jjb/lf-python-jobs.rst
index 0ef27d9..8f4f6bd 100644 (file)
--- a/docs/jjb/lf-python-jobs.rst
+++ b/docs/jjb/lf-python-jobs.rst
@@ -449,7 +449,7 @@ PyPI section.
     - gerrit-pypi-merge
     - github-pypi-merge
 
-:Comment Trigger: pypi-remerge
+:Comment Trigger: remerge
 
 :Required Parameters:
 
@@ -563,6 +563,8 @@ An example of a pypi release file appears below.
     - gerrit-pypi-release-verify
     - github-pypi-release-verify
 
+:Comment Trigger: recheck
+
 :Required Parameters:
 
     :build-node: The node to run build on, which must be Centos.
@@ -644,6 +646,8 @@ The special parameters are as follows::
     - gerrit-pypi-release-merge
     - github-pypi-release-merge
 
+:Comment Trigger: remerge
+
 :Required Parameters:
 
     :build-node: The node to run build on, which must be Centos.

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index df82d8f..b334c78 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -704,9 +704,9 @@
     pre-build-script: "# pre-build script goes here"
     python-version: python3
     stream: master
+    submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
-    submodule-disable: false
     tox-dir: "."
     tox-envs: ""
 
@@ -800,15 +800,6 @@
     <<: *lf_pypi_common
     <<: *lf_pypi_verify_builders
 
-    gerrit_verify_triggers:
-      - patchset-created-event:
-          exclude-drafts: true
-          exclude-trivial-rebase: false
-          exclude-no-code-change: false
-      - draft-published-event
-      - comment-added-contains-event:
-          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
-
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
@@ -823,7 +814,14 @@
     triggers:
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_verify_triggers}"
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: true
+                exclude-trivial-rebase: false
+                exclude-no-code-change: false
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"
@@ -877,11 +875,6 @@
     cron: ""
     pypi-repo: pypi-test
 
-    gerrit_merge_triggers:
-      - change-merged-event
-      - comment-added-contains-event:
-          comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
-
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
@@ -897,7 +890,10 @@
       - timed: "{obj:cron}"
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_merge_triggers}"
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"
@@ -1000,15 +996,6 @@
     <<: *lf_pypi_release_common
     <<: *lf_pypi_release_verify_builders
 
-    gerrit_verify_triggers:
-      - patchset-created-event:
-          exclude-drafts: true
-          exclude-trivial-rebase: false
-          exclude-no-code-change: false
-      - draft-published-event
-      - comment-added-contains-event:
-          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
-
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
@@ -1023,7 +1010,14 @@
     triggers:
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_verify_triggers}"
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: true
+                exclude-trivial-rebase: false
+                exclude-no-code-change: false
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
           projects:
             - project-compare-type: "ANT"
               project-pattern: "{project}"
@@ -1076,9 +1070,6 @@
     <<: *lf_pypi_release_common
     <<: *lf_pypi_release_merge_builders
 
-    gerrit_release_triggers:
-      - change-merged-event
-
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
@@ -1093,7 +1084,10 @@
     triggers:
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_release_triggers}"
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
           projects:
             - project-compare-type: "ANT"
               project-pattern: "{project}"

diff --git a/jjb/lf-rtdv2-jobs.yaml b/jjb/lf-rtdv2-jobs.yaml
index 326c363..8acfa5f 100644 (file)
--- a/jjb/lf-rtdv2-jobs.yaml
+++ b/jjb/lf-rtdv2-jobs.yaml
@@ -94,7 +94,7 @@
           server-name: "{gerrit-server-name}"
           trigger-on: "{obj:gerrit_verify_triggers}"
           projects:
-            - project-compare-type: "REG_EXP"
+            - project-compare-type: "ANT"
               project-pattern: "**"
               branches:
                 - branch-compare-type: "ANT"
@@ -145,7 +145,7 @@
           server-name: "{gerrit-server-name}"
           trigger-on: "{obj:gerrit_merge_triggers}"
           projects:
-            - project-compare-type: "REG_EXP"
+            - project-compare-type: "ANT"
               project-pattern: "**"
               branches:
                 - branch-compare-type: "ANT"

diff --git a/releasenotes/notes/add-pypi-release-merge-trigger-611855d749779d45.yaml b/releasenotes/notes/add-pypi-release-merge-trigger-611855d749779d45.yaml
new file mode 100644 (file)
index 0000000..ac280fc
--- /dev/null
+++ b/releasenotes/notes/add-pypi-release-merge-trigger-611855d749779d45.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Add missing trigger "remerge" to the PyPI release merge template.
+    Move trigger definitions into PyPI templates, instead of defining
+    four separate trigger definition blocks and using each exactly once.
+    Document the required comment text for the triggers.

diff --git a/releasenotes/notes/fix-rtd-trigger-handle-ref-updated-c78eadbe4e72d38c.yaml b/releasenotes/notes/fix-rtd-trigger-handle-ref-updated-c78eadbe4e72d38c.yaml
new file mode 100644 (file)
index 0000000..f666ded
--- /dev/null
+++ b/releasenotes/notes/fix-rtd-trigger-handle-ref-updated-c78eadbe4e72d38c.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fix rtd merge job to handle case of a new tag upload. When a new tag is
+    pushed this sets the gerrit event type to "ref-updated", and sets the
+    `branch=*` which is invalid. The change handles the case of tag update
+    and builds against the appropriate branch for that tag.

diff --git a/shell/rtd-trigger-build.sh b/shell/rtd-trigger-build.sh
index 6af08d7..30a04ca 100644 (file)
--- a/shell/rtd-trigger-build.sh
+++ b/shell/rtd-trigger-build.sh
@@ -27,6 +27,9 @@ set -e -o pipefail
 last_char=${RTD_BUILD_URL:length-1:1}
 [[ $last_char != "/" ]] && RTD_BUILD_URL="$RTD_BUILD_URL/"; :
 
+# Handle case for gerrit event type is ref-updated when new tag are pushed
+[[ $GERRIT_EVENT_TYPE =~ "ref-updated" ]] && GERRIT_BRANCH=${GERRIT_REFNAME##*/}
+
 json=$(curl -X POST -d "branches=${GERRIT_BRANCH}" -d "token=$RTD_TOKEN" "$RTD_BUILD_URL")
 build_triggered=$(echo "$json" | jq -r .build_triggered)