X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=a0f818e944cc9e96db43700d1cb7b419a1150df8;hb=9c9feb37d817b1829d82e1531fa3a85499cbe7c4;hp=baf68f15e267490e4a88a5b10aac2d36d5fc83a7;hpb=3c806b766837f247cdce1c8b60012059aacc6aff;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index baf68f15..a0f818e9 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -111,7 +111,7 @@
     java-version: openjdk8
     nexus-iq-cli-version: 1.44.0-01
     nexus-iq-namespace: "" # Recommend a trailing dash when set. Example: odl-
-    pre-build-script: "# pre-build script goes here"
+    pre-build-script: "  # pre-build script goes here"
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -158,7 +158,6 @@
     name: "{project-name}-python-clm-{stream}"
     id: gerrit-python-xc-clm
     <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_python_xc_clm
 
     ######################
@@ -207,7 +206,6 @@
     name: "{project-name}-python-clm-{stream}"
     id: github-python-xc-clm
     <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_python_xc_clm
 
     properties:
@@ -267,10 +265,16 @@
     pre-build-script: "# pre-build script goes here"
     python-version: python3
     sonar-mvn-goal: "sonar:sonar"
+    sonarcloud: false
+    sonarcloud-project-key: ""
+    sonarcloud-project-organization: ""
+    sonarcloud-api-token: ""
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
     submodule-disable: false
+    tox-dir: "."
+    tox-envs: ""
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -291,6 +295,9 @@
           project: "{project}"
           branch: "{branch}"
           stream: "{stream}"
+      - lf-infra-tox-parameters:
+          tox-dir: "{tox-dir}"
+          tox-envs: "{tox-envs}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: "{archive-artifacts}"
@@ -320,11 +327,34 @@
       - lf-provide-maven-settings:
           global-settings-file: "{mvn-global-settings}"
           settings-file: "{mvn-settings}"
-      - lf-infra-maven-sonar:
-          java-version: "{java-version}"
-          mvn-goals: "{mvn-goals}"
-          mvn-settings: "{mvn-settings}"
-          mvn-version: "{mvn-version}"
+      # With SonarCloud
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: "{sonarcloud}"
+          steps:
+            - shell: echo 'Using SonarCloud'
+            - lf-infra-maven-sonarcloud:
+                java-version: "{java-version}"
+                mvn-goals: "{mvn-goals}"
+                mvn-settings: "{mvn-settings}"
+                mvn-version: "{mvn-version}"
+                sonarcloud-project-key: "{sonarcloud-project-key}"
+                # yamllint disable-line rule:line-length
+                sonarcloud-project-organization: "{sonarcloud-project-organization}"
+                sonarcloud-api-token: "{sonarcloud-api-token}"
+      # With SonarQube
+      - conditional-step:
+          condition-kind: not
+          condition-operand:
+            condition-kind: boolean-expression
+            condition-expression: "{sonarcloud}"
+          steps:
+            - shell: echo 'Using SonarQube'
+            - lf-infra-maven-sonar:
+                java-version: "{java-version}"
+                mvn-goals: "{mvn-goals}"
+                mvn-settings: "{mvn-settings}"
+                mvn-version: "{mvn-version}"
 
     publishers:
       - lf-infra-publish
@@ -333,7 +363,6 @@
     name: "{project-name}-tox-sonar"
     id: gerrit-tox-sonar
     <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_tox_sonar
 
     ######################
@@ -381,7 +410,6 @@
     name: "{project-name}-tox-sonar"
     id: github-tox-sonar
     <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_tox_sonar
 
     properties:
@@ -662,6 +690,8 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: >
+      **/*.log
     branch: master
     build-days-to-keep: 7
     build-timeout: 15
@@ -673,14 +703,12 @@
     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: ""
 
-    disabled: "{disable-job}"
-
     gerrit_trigger_file_paths:
       - compare-type: ANT
         pattern: ".*"
@@ -689,6 +717,18 @@
     github_included_regions:
       - ".*"
 
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: "{build-node}"
+    disabled: "{disable-job}"
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
     parameters:
       - lf-infra-parameters:
           project: "{project}"
@@ -707,6 +747,25 @@
           description: |
             If DRY_RUN is enabled artifacts are not published.
 
+    publishers:
+      - lf-infra-publish
+
+- lf_pypi_common_wrappers: &lf_pypi_common_wrappers
+    name: lf-pypi-common-wrappers
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+- lf_pypi_release_wrappers: &lf_pypi_release_wrappers
+    name: lf-pypi-release-wrappers
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+
 - lf_pypi_verify_builders: &lf_pypi_verify_builders
     name: lf-pypi-verify-builders
 
@@ -764,20 +823,10 @@
 - job-template:
     name: "{project-name}-pypi-verify-{stream}"
     id: gerrit-pypi-verify
-    <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_pypi_common
+    <<: *lf_pypi_common_wrappers
     <<: *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}"
@@ -792,7 +841,15 @@
     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:
+                # yamllint disable-line rule:line-length
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"
@@ -804,9 +861,8 @@
 - job-template:
     name: "{project-name}-pypi-verify-{stream}"
     id: github-pypi-verify
-    <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_pypi_common
+    <<: *lf_pypi_common_wrappers
     <<: *lf_pypi_verify_builders
 
     properties:
@@ -838,19 +894,13 @@
 - job-template:
     name: "{project-name}-pypi-merge-{stream}"
     id: gerrit-pypi-merge
-    <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_pypi_common
+    <<: *lf_pypi_common_wrappers
     <<: *lf_pypi_merge_builders
 
     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}"
@@ -866,7 +916,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}"
@@ -878,9 +931,8 @@
 - job-template:
     name: "{project-name}-pypi-merge-{stream}"
     id: github-pypi-merge
-    <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_pypi_common
+    <<: *lf_pypi_common_wrappers
     <<: *lf_pypi_merge_builders
 
     cron: ""
@@ -929,6 +981,7 @@
       - compare-type: REG_EXP
         pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
 
+    # yamllint disable-line rule:line-length
     # github_release_included_regions MUST match gerrit_release_trigger_file_paths
     github_release_included_regions:
       - 'releases\/.*\.yaml'
@@ -963,21 +1016,11 @@
 - job-template:
     name: "{project-name}-pypi-release-verify-{stream}"
     id: gerrit-pypi-release-verify
-    <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_pypi_common
+    <<: *lf_pypi_common_wrappers
     <<: *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}"
@@ -992,21 +1035,28 @@
     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:
+                # yamllint disable-line rule:line-length
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
           projects:
             - project-compare-type: "ANT"
               project-pattern: "{project}"
               branches:
-                - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
     name: "{project-name}-pypi-release-verify-{stream}"
     id: github-pypi-release-verify
-    <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_pypi_common
+    <<: *lf_pypi_common_wrappers
     <<: *lf_pypi_release_common
     <<: *lf_pypi_release_verify_builders
 
@@ -1039,15 +1089,11 @@
 - job-template:
     name: "{project-name}-pypi-release-merge-{stream}"
     id: gerrit-pypi-release-merge
-    <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_pypi_common
+    <<: *lf_pypi_release_wrappers
     <<: *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}"
@@ -1062,21 +1108,23 @@
     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}"
               branches:
-                - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
     name: "{project-name}-pypi-release-merge-{stream}"
     id: github-pypi-release-merge
-    <<: *lf_python_common
-    # yamllint disable-line rule:key-duplicates
     <<: *lf_pypi_common
+    <<: *lf_pypi_release_wrappers
     <<: *lf_pypi_release_common
     <<: *lf_pypi_release_merge_builders