Merge "Fix missing mono rpms for java-builder image"

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 3673c01669da4cf36515f1812982cc749a31d3c0..66d8808b183079958dc72666b202720302cdd65b 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -30,4 +30,10 @@ for module in $modules; do
     popd
 done
 
+tar cvzf all-bundles.tar.gz `find $PATCH_DIR -type f -print0 \
+                                | xargs -0r file             \
+                                | egrep -e ':.*Git bundle.*' \
+                                | cut -d: -f1`
+rm $PATCH_DIR/*.bundle
+
 ./scripts/fix-relativepaths.sh

diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
index c6e5316a1196bb3a6d2c0f498437ddf53d2805b9..936d3eabc34bf65b39b9493e946869b3db8af013 100644 (file)
--- a/jjb/include-raw-deploy-archives.sh
+++ b/jjb/include-raw-deploy-archives.sh
@@ -68,6 +68,8 @@ if [ ! -z "${{ARCHIVE_ARTIFACTS}}" ]; then
     shopt -u globstar  # Disable globstar once archives are copied
     popd
 fi
+
+
 # Ignore logging if archives doesn't exist
 mv $WORKSPACE/archives/ $ARCHIVES_DIR > /dev/null 2>&1
 touch $ARCHIVES_DIR/_build-details.txt

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ab1cfa061832c44a3ff2ec53a90b8deed8f0dbd7..61295cb4e53390875da8a2051b862f0cf072b26e 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -34,6 +34,8 @@
           templates: mininet-ovs-2.5
         - platforms: ubuntu-14.04
           templates: java-builder
+        - platforms: centos
+          templates: gbp
 
     project-type: freestyle
     archive-artifacts: '**/*.log'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 9caa5f984e93ffa5fe38c907b96c05972d2b8aee..ad8204cb166a465763b54ca852927b346ca03205 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -66,7 +66,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -97,28 +97,34 @@
             jobs: '{project}-merge-{stream}'
             result: 'success'
 
-    prebuilders:
+    builders:
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -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-distribution-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+            settings: 'integration-distribution-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            goals: 'validate jar:jar deploy:deploy -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+            settings: 'integration-distribution-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
         - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
@@ -308,7 +314,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -340,23 +346,29 @@
             name: '{project}'
             branch: '{branch}'
 
-    prebuilders:
+    builders:
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '{mvn-opts}'
-        settings: '{mvn-settings}'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: 'validate jar:jar deploy:deploy -V -B -Djenkins -Dmerge -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - conditional-step:
             condition-kind: file-exists
             condition-filename: deploy-site.xml
@@ -390,17 +402,11 @@
                 global-settings: 'odl-global-settings'
                 global-settings-type: cfp
 
-    reporters:
-        - findbugs
-
     publishers:
         - email-notification:
             email-prefix: '[{project-name}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
         - jacoco-report
+        - findbugs
         - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 6c86c05dcf6db16d1990fa63f7751530fa693519..a2472d9925cdc38c8e001bb5b0dcf59c1909d4dd 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -24,8 +24,6 @@
     jdks:
         - openjdk8
     maven:
-        - mvn32:
-            mvn-version: '{mvn32}'
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'yangtools-settings'