Merge "Add a prefix variable to defaults as blank"

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

diff --git a/jjb/integration/distribution/distribution-macros.yaml b/jjb/integration/distribution/distribution-macros.yaml
index bab7b0742b76cab6d48d5b7464bc43b5431bf641..d8625c6cb0aa9e3630590fe853f9f25244b3b8b4 100644 (file)
--- a/jjb/integration/distribution/distribution-macros.yaml
+++ b/jjb/integration/distribution/distribution-macros.yaml
@@ -230,20 +230,40 @@
     name: distribution-check-warn-9191
     # Detect ODL bundles referenced cross-project from features, store them to a file to be archived.
     # Do not fail the build, this is just to inform interested contributors.
-    # TODO: Improve integration archiving macro so that it finds bug9191.log without us crating it in $WORKSPACE/.
+    # TODO: Improve integration archiving macro so that it finds bug_9191 log without us crating it in $WORKSPACE/.
     builders:
       - shell: |
           # No failure in this macro should affect the job result.
           set +e
-          rm -f "$WORKSPACE/bug9191.log"
+          rm -f "$WORKSPACE/bug_9191.log"
           pushd "$WORKSPACE/distribution/$KARAF_ARTIFACT/target/assembly/system/org/opendaylight"
           for folder in `ls`; do
-          find "$folder" -name \*features.xml | xargs fgrep -n '<bundle>' > bug9191.0.log
-          fgrep org.opendaylight bug9191.0.log | fgrep -v "org.opendaylight.$folder" >> "$WORKSPACE/bug9191.log"
-          rm bug9191.0.log
+          find "$folder" -name \*features.xml | xargs fgrep -n '<bundle>' > bug_9191.0.log
+          fgrep org.opendaylight bug_9191.0.log | fgrep -v "org.opendaylight.$folder" >> "$WORKSPACE/bug_9191.log"
+          rm bug_9191.0.log
           done
           popd
 
+- builder:
+    name: distribution-check-warn-9192
+    # Detect ODL bundles referenced from multiple features within a project, store them to a file to be archived.
+    # Current implementation will also include Bug 9191 violations,
+    # presenting an unified diff with lines marked to be removed, among unmarked lines to compare to.
+    # Do not fail the build, this is just to inform interested contributors.
+    # TODO: Improve integration archiving macro so that it finds bug_9192 log without us crating it in $WORKSPACE/.
+    builders:
+      - shell: |
+          # No failure in this macro should affect the job result.
+          set +e
+          pushd "$WORKSPACE/distribution/$KARAF_ARTIFACT/target/assembly/system/org/opendaylight"
+          find . -name \*features.xml | xargs fgrep -n '<bundle>' > "$WORKSPACE/bug_9192.0.log"
+          popd
+          fgrep org.opendaylight bug_9192.0.log > "$WORKSPACE/bug_9192.1.log"
+          sort -s -t '<' -k 2 "$WORKSPACE/bug_9192.1.log" > "$WORKSPACE/bug_9192.2.log"
+          sort -u -s -t '<' -k 2 "$WORKSPACE/bug_9192.1.log" > "$WORKSPACE/bug_9192.3.log"
+          diff -U 999 -b -t -d "$WORKSPACE/bug_9192.2.log" "$WORKSPACE/bug_9192.3.log" > "$WORKSPACE/bug_9192.diff.log"
+          rm -f "$WORKSPACE"/bug_9192.?.log
+
 - builder:
     name: distribution-check-bootup
     # Operation: Locally deploy ODL with all fetures, check it is not broken.