X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=78976d96e6d87505d5fa739cbdd8d7c74c831713;hb=e20b15582fcad2d7ac73e310bdab8a6c7db55025;hp=9b077e4adadc896a2bad5b88551617ff709f5cfd;hpb=33157b200cf17ea688c996d2b9683a442515bdc3;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 9b077e4a..78976d96 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -1,23 +1,4 @@
 ---
-- job-group:
-    name: '{project-name}-python-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci that is using Gerrit.
-
-    jobs:
-      - gerrit-python-xc-clm
-      - gerrit-tox-verify
-
-- job-group:
-    name: '{project-name}-github-python-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci that is using GitHub.
-
-    jobs:
-      - github-python-xc-clm
-      - github-tox-verify
 
 ##########
 # Macros #
@@ -92,13 +73,15 @@
     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
+    nexus-iq-namespace: ''  # Recommend a trailing dash when set. Example: odl-
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_trigger_file_paths:
       - compare-type: ANT
@@ -112,6 +95,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -133,7 +118,7 @@
       - lf-update-java-alternatives:
           java-version: '{java-version}'
       - lf-infra-clm-python:
-          clm-project-name: '{project-name}'
+          clm-project-name: '{nexus-iq-namespace}{project-name}'
 
 - job-template:
     name: '{project-name}-python-clm-{stream}'
@@ -161,6 +146,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     triggers:
@@ -201,6 +187,7 @@
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -213,6 +200,8 @@
           status-context: 'CLM'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
           included-regions: '{obj:github_included_regions}'
 
 ########################
@@ -230,6 +219,7 @@
     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
@@ -240,6 +230,7 @@
     sonar-mvn-goal: 'sonar:sonar'
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -253,6 +244,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -279,11 +272,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
@@ -340,6 +329,7 @@
           refspec: $GERRIT_REFSPEC
           branch: $GERRIT_BRANCH
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     triggers:
@@ -379,6 +369,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -389,6 +380,8 @@
           status-context: 'Python Sonar'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
           included-regions: '{obj:github_included_regions}'
 
 ##############
@@ -405,12 +398,14 @@
     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
     submodule-recursive: true
+    submodule-timeout: 10
     tox-dir: ''
     tox-envs: ''
 
@@ -429,6 +424,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -454,11 +450,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
@@ -496,6 +488,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -528,6 +521,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -538,4 +532,6 @@
           status-context: 'Tox Verify'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
           included-regions: '{obj:github_included_regions}'