X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=5a2d193dac865a40b2c86a2ac9d3e3c92bed54d9;hb=6d0b661360e45fe139ff9689c3ff23f657bad599;hp=de38fa1bb14fca199d1d995361c674fd17e831f9;hpb=2ded6bf745aeb45cd14f9d09bd5822ebaf2bc1a2;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index de38fa1b..5a2d193d 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -265,7 +265,7 @@
     mvn-version: mvn35
     parallel: true
     pre-build-script: "# pre-build script goes here"
-    python-version: python2
+    python-version: python3
     sonar-mvn-goal: "sonar:sonar"
     stream: master
     submodule-recursive: true
@@ -431,7 +431,7 @@
     github-url: "https://github.com"
     parallel: false
     pre-build-script: "# pre-build script goes here"
-    python-version: python2
+    python-version: python3
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -679,6 +679,8 @@
     tox-dir: "."
     tox-envs: ""
 
+    disabled: "{disable-job}"
+
     gerrit_trigger_file_paths:
       - compare-type: ANT
         pattern: ".*"
@@ -699,6 +701,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
@@ -836,6 +843,7 @@
     <<: *lf_pypi_common
     <<: *lf_pypi_merge_builders
 
+    cron: ""
     pypi-repo: staging
 
     gerrit_merge_triggers:
@@ -855,6 +863,7 @@
           choosing-strategy: gerrit
 
     triggers:
+      - timed: "{obj:cron}"
       - gerrit:
           server-name: "{gerrit-server-name}"
           trigger-on: "{obj:gerrit_merge_triggers}"
@@ -874,6 +883,7 @@
     <<: *lf_pypi_common
     <<: *lf_pypi_merge_builders
 
+    cron: ""
     pypi-repo: staging
 
     properties:
@@ -892,6 +902,7 @@
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
+      - timed: "{obj:cron}"
       - github-pull-request:
           trigger-phrase: "^remerge$"
           only-trigger-phrase: false
@@ -913,12 +924,13 @@
     pypi-repo: pypi
     use-release-file: true
 
-    gerrit_trigger_file_paths:
+    # define once and use twice; jobs MUST NOT override
+    gerrit_release_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
 
-    # github_included_regions MUST match gerrit_trigger_file_paths
-    github_included_regions:
+    # github_release_included_regions MUST match gerrit_release_trigger_file_paths
+    github_release_included_regions:
       - 'releases\/.*\.yaml'
       - '.releases\/.*\.yaml'
 
@@ -987,7 +999,7 @@
               branches:
                 - branch-compare-type: "ANT"
                   branch-pattern: "**"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
+              file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
     name: "{project-name}-pypi-release-verify-{stream}"
@@ -1022,7 +1034,7 @@
           github-hooks: true
           white-list-target-branches:
             - "{branch}"
-          included-regions: "{obj:github_included_regions}"
+          included-regions: "{obj:github_release_included_regions}"
 
 - job-template:
     name: "{project-name}-pypi-release-merge-{stream}"
@@ -1057,7 +1069,7 @@
               branches:
                 - branch-compare-type: "ANT"
                   branch-pattern: "**"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
+              file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
     name: "{project-name}-pypi-release-merge-{stream}"
@@ -1092,4 +1104,4 @@
           github-hooks: true
           white-list-target-branches:
             - "{branch}"
-          included-regions: "{obj:github_included_regions}"
+          included-regions: "{obj:github_release_included_regions}"