X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=dbd09441f0860b3538e2a1b97a6625300779526a;hb=7265d1f18e9895a1d86449c3ee9fa57edd023df9;hp=a32a487312473a5afdd5384631f79f23a4706112;hpb=b788ff5c5fdd15bf913b546f451a2045d446d054;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index a32a4873..dbd09441 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -92,10 +92,11 @@
     branch: master
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     nexus-iq-cli-version: 1.44.0-01
-    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
 
@@ -111,6 +112,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -192,7 +195,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -212,6 +215,8 @@
           status-context: 'CLM'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
           included-regions: '{obj:github_included_regions}'
 
 ########################
@@ -229,7 +234,9 @@
     build-days-to-keep: 7
     build-timeout: 60
     cron: 'H H * * *'  # run daily
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     python-version: python2
     mvn-global-settings: global-settings
@@ -251,6 +258,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -277,11 +286,7 @@
               can call "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar".
 
     builders:
-      - shell: !include-raw-escape:
-          # Workaround issue where the tox run later breaks the lftools virtualenv.
-          # Without running the install first the run in the publisher will fail
-          # due to missing lftools because it gets installed into a tox venv.
-          - ../shell/lftools-install.sh
+      - lf-infra-pre-build
       - lf-infra-tox-install:
           python-version: '{python-version}'
       - shell: !include-raw-escape: ../shell/tox-run.sh
@@ -369,7 +374,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -387,6 +392,8 @@
           status-context: 'Python Sonar'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
           included-regions: '{obj:github_included_regions}'
 
 ##############
@@ -403,7 +410,9 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 15
+    disable-job: false
     git-url: '$GIT_URL/$GERRIT_PROJECT'
+    github-url: 'https://github.com'
     parallel: true
     python-version: python2
     stream: master
@@ -426,6 +435,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -451,11 +461,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     builders:
-      - shell: !include-raw-escape:
-          # Workaround issue where the tox run later breaks the lftools virtualenv.
-          # Without running the install first the run in the publisher will fail
-          # due to missing lftools because it gets installed into a tox venv.
-          - ../shell/lftools-install.sh
+      - lf-infra-pre-build
       - lf-infra-tox-install:
           python-version: '{python-version}'
       - shell: !include-raw-escape: ../shell/tox-run.sh
@@ -517,7 +523,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -535,4 +541,6 @@
           status-context: 'Tox Verify'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
           included-regions: '{obj:github_included_regions}'