Merge "Allow for dynamic image select in csit"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c42dc23893c8e855ee832311d4238f7cf56d736b..f9fcb5067b54b16589e20c2c9e4fafe25da04496 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -908,3 +908,110 @@
             artifacts: '*log*'
         - email-notification:
             email-prefix: '[{project}]'
+
+# Template: {project}-patch-test-{stream}
+# Goal: Build a patch and run project specific system test on a distribution containing the change
+# Operation: This job template builds a patch, creates a distribution containing the patch, and
+# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
+
+- job-template:
+    name: '{project}-patch-test-{stream}'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - gerrit-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: '$GERRIT_REFSPEC'
+        - project-parameter:
+            project: '{project}'
+        - integration-branch:
+            branch: '{branch}'
+        - integration-distribution-git-url
+
+    scm:
+        - integration-gerrit-scm:
+            credentials-id: '{ssh-credentials}'
+            basedir: '{project}'
+            refspec: '$GERRIT_REFSPEC'
+            branch: '{branch}'
+        - integration-distribution-scm:
+            credentials-id: '{ssh-credentials}'
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-{project}'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
+    prebuilders:
+        - integration-rebase-gerrit-patch
+        - integration-get-bundle-url
+        - inject:
+            properties-file: 'bundle.txt'
+        - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'integration-settings'
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: '{project}/pom.xml'
+            goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            java-opts:
+                - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            settings: 'integration-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'distribution/pom.xml'
+        goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: 'integration-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
+        ignore-upstream-changes: true
+        post-step-run-condition: 'SUCCESS'
+
+    postbuilders:
+        - trigger-builds:
+            - project: '{csit-list}'
+              block: true
+              predefined-parameters:
+                  BUNDLEURL=$BUNDLEURL
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index b5d91f6341f31fe7bd86470b20cbbff4cc492542..82d1d558dcb512db663583949ded0f4e66c5c443 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -33,7 +33,6 @@
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-helium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
@@ -90,7 +89,6 @@
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
@@ -147,7 +145,6 @@
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
@@ -391,7 +388,7 @@
 
     postbuilders:
         - trigger-builds:
-            - project: 'integration-distribution-test-{stream}'
+            - project: '{csit-list}'
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
@@ -454,7 +451,7 @@
 
     postbuilders:
         - trigger-builds:
-            - project: 'integration-distribution-test-{stream}'
+            - project: '{csit-list}'
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 3375f6578c06a4f0b32b96e543dba28ca54c0889..77692ee60c6c75503c4d58e120ad1a2d2a27e44f 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-openflowplugin-all'
+    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all'
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
index d4ae7666d711e78728af865780fa28803fe2fd5c..f3021cfac11005e22b37c383de10209e01c5314c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
@@ -23,7 +23,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-he'
 
     # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
+    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:400 -v STEP_SWITCHES:50'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
index ebc7d27626e905418389b2b6098684e91727e950..5cb7fe9365d3de6a06f8c03acd9f988433d176d9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
@@ -26,7 +26,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-li'
 
     # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
+    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:400 -v STEP_SWITCHES:50'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index ccec832b42234d2390ef27d92c7d75df4931b81e..1e04849cadde4c74172b80f18bcc788776aab33f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
@@ -23,7 +23,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui'
 
     # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
+    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:400 -v STEP_SWITCHES:50'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
new file mode 100644 (file)
index 0000000..36b5ba2
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -0,0 +1,40 @@
+- project:
+    name: openflowplugin-patch-test
+    jobs:
+        - '{project}-patch-test-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            csit-list: >
+                openflowplugin-csit-1node-flow-services-only-{stream},
+                openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-flow-services-all-{stream},
+                openflowplugin-csit-1node-scalability-only-{stream},
+                openflowplugin-csit-1node-scalability-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-config-performance-only-{stream},
+                openflowplugin-csit-1node-config-performance-helium-redesign-only-{stream}
+                openflowplugin-csit-3node-clustering-only-{stream}
+                openflowplugin-csit-3node-clustering-only-helium-redesign-{stream}
+
+        - beryllium:
+            branch: 'stable/beryllium'
+            csit-list: >
+                openflowplugin-csit-1node-flow-services-only-{stream},
+                openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-flow-services-all-{stream},
+                openflowplugin-csit-1node-scalability-only-{stream},
+                openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-config-performance-only-{stream},
+                openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream}
+                openflowplugin-csit-3node-clustering-only-{stream}
+                openflowplugin-csit-3node-clustering-only-lithium-redesign-{stream}
+