X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=df82d8fd20de3a76d5316d5ca23eea7f2c921435;hb=refs%2Fchanges%2F98%2F61998%2F4;hp=ead9195c08f85c027dede67d2d8e1b42c7304444;hpb=6df0883fb085c17d7c53480783034cac21133399;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index ead9195c..df82d8fd 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -267,10 +267,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 +297,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 +329,33 @@
       - 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}"
+                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
@@ -701,6 +732,11 @@
           name: BUILD_BDIST_WHEEL
           default: "{dist-binary}"
           description: "Set to True to build a wheel"
+      - bool:
+          name: DRY_RUN
+          default: false
+          description: |
+            If DRY_RUN is enabled artifacts are not published.
 
 - lf_pypi_verify_builders: &lf_pypi_verify_builders
     name: lf-pypi-verify-builders
@@ -839,7 +875,7 @@
     <<: *lf_pypi_merge_builders
 
     cron: ""
-    pypi-repo: staging
+    pypi-repo: pypi-test
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -879,7 +915,7 @@
     <<: *lf_pypi_merge_builders
 
     cron: ""
-    pypi-repo: staging
+    pypi-repo: pypi-test
 
     properties:
       - github:
@@ -992,8 +1028,8 @@
             - 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:
@@ -1062,8 +1098,8 @@
             - 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: