Adjust for karaf 4 not happening in carbon

[releng/builder.git] / jjb / integration / distribution / distribution-jobs.yaml

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 4790f14be983d33131f09f47c8b5b7eef3e98cf3..7a6345f074fd4fa4ade0d9b4e9069f7d87faa077 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -5,7 +5,7 @@
 - job-template:
     name: 'distribution-verify-{stream}'
 
-    project-type: maven
+    project-type: freestyle
     node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jre}'
@@ -40,31 +40,27 @@
           branch: '{branch}'
           files: '**'
 
-    prebuilders:
+    builders:
       - wipe-org-opendaylight-repo
       - provide-maven-settings:
           global-settings-file: 'odl-global-settings'
           settings-file: 'integration-settings'
-
-    maven:
-      maven-name: 'mvn33'
-      root-pom: 'pom.xml'
-      goals: >
-          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
-          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          -Djenkins -Dstream={stream}
-      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-      settings: 'integration-settings'
-      settings-type: cfp
-      global-settings: 'odl-global-settings'
-      global-settings-type: cfp
-      ignore-upstream-changes: true
-      post-step-run-condition: 'SUCCESS'
-
-    reporters:
-      - findbugs
+      - maven-target:
+          maven-version: mvn33
+          pom: pom.xml
+          goals: |
+              clean install dependency:tree -DoutputFile=dependency_tree.txt
+              -Dstream={stream}
+              {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '-Xmx1024m -XX:MaxPermSize=256m'
+          settings: integration-settings
+          settings-type: cfp
+          global-settings: odl-global-settings
+          global-settings-type: cfp
 
     publishers:
+      - findbugs
       - jacoco-report
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
@@ -363,12 +359,12 @@
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
 
-# Delete these when Karaf 4 becomes Carbon default.
+# Delete these when Karaf 4 becomes Nitrogen default.
 
 # TODO: Is there a way to de-duplicate with generic template parts?
 
 - job-template:
-    name: 'distribution4-check-carbon'
+    name: 'distribution3-check-nitrogen'
     disabled: false
 
     project-type: freestyle
@@ -384,11 +380,11 @@
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: stable/carbon
-          refspec: refs/heads/stable/carbon
+          branch: master
+          refspec: refs/heads/master
           artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
       - maven-exec:
           maven-version: mvn33
 
@@ -396,7 +392,7 @@
       - integration-gerrit-scm:
           basedir: distribution
           refspec: '$GERRIT_REFSPEC'
-          branch: stable/carbon
+          branch: master
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -411,7 +407,7 @@
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
           project: '{project}'
-          branch: 'stable/carbon'
+          branch: 'master'
           files: '**'
 
     builders:
@@ -447,7 +443,7 @@
           maven-version: 'mvn33'
 
 - job-template:
-    name: 'distribution4-deploy-carbon'
+    name: 'distribution3-deploy-nitrogen'
     disabled: false
 
     project-type: freestyle
@@ -462,17 +458,17 @@
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts} **/*.hprof'
       - integration-distribution-branch:
-          branch: 'stable/carbon'
+          branch: 'master'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -492,7 +488,7 @@
           maven-version: 'mvn33'
 
 - job-template:
-    name: 'distribution4-offline-carbon'
+    name: 'distribution3-offline-nitrogen'
     disabled: false
 
     project-type: freestyle
@@ -507,17 +503,17 @@
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts} **/*.hprof'
       - integration-distribution-branch:
-          branch: 'stable/carbon'
+          branch: 'master'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
 
     wrappers:
       - opendaylight-infra-wrappers: