Setup tools in global-jjb tox.ini

[releng/global-jjb.git] / jjb / lf-python-jobs.yaml

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index fc644c0..680228a 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -51,10 +51,7 @@
 
     archive-artifacts: >
       **/*.log
-      **/hs_err_*.log
-      **/target/**/feature.xml
-      **/target/failsafe-reports/failsafe-summary.xml
-      **/target/surefire-reports/*-output.txt
+    nexus-iq-cli-version: 1.44.0-01
 
     #####################
     # Job Configuration #
@@ -73,14 +70,6 @@
           branch: '{branch}'
           stream: '{stream}'
           lftools-version: '{lftools-version}'
-      - string:
-          name: NEXUS_IQ_CLI_JAR
-          default: nexus-iq-cli-1.44.0-01.jar
-          description: Nexus IQ CLI package to download and use.
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     wrappers:
       - lf-infra-wrappers:
@@ -113,11 +102,25 @@
     gerrit_clm_triggers:
       - comment-added-contains-event:
           comment-contains-value: run-clm$
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: '**'
 
     #####################
     # Job Configuration #
     #####################
 
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+      - string:
+          name: NEXUS_IQ_CLI_VERSION
+          default: '{nexus-iq-cli-version}'
+          description: Nexus IQ CLI package to download and use.
+
     triggers:
       # Build weekly on Saturdays
       - timed: 'H H * * 6'
@@ -130,6 +133,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
           skip-vote:
             successful: true
             failed: true
@@ -216,7 +220,7 @@
     python-version: python2
     mvn-global-settings: global-settings
     mvn-settings: '{mvn-settings}'
-    mvn-version: mvn33
+    mvn-version: mvn35
     sonar-mvn-goal: 'sonar:sonar'
     stream: master
     submodule-recursive: true
@@ -224,6 +228,9 @@
     gerrit_sonar_triggers:
       - comment-added-contains-event:
           comment-contains-value: run-sonar$
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: '**'
 
     #####################
     # Job Configuration #
@@ -265,6 +272,7 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/master'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
           skip-vote:
             successful: true
             failed: true
@@ -435,6 +443,11 @@
       - draft-published-event
       - comment-added-contains-event:
           comment-contains-value: recheck$
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: '**'
+
+    parallel: true
 
     #####################
     # Job Configuration #
@@ -449,6 +462,13 @@
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: gerrit
 
+    parameters:
+      - bool:
+          name: PARALLEL
+          default: '{parallel}'
+          description: Tox test type used to configure serial or parallel testing.
+
+
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
@@ -459,6 +479,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
 
 - job-template:
     # Python projects typically use tox to run testing.