Bug 9192: Log violations in distribution-check

Change-Id: I941eb2a08fe82aa5746ee93fc83a84c49c60fb68
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 460497fc617e24dec56714f4f19130a6e1d029d9..f783d10ff2e8509467667f74d7ba55bef2d459af 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -247,6 +247,7 @@
           mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
       - integration-set-variables
       - distribution-check-warn-9191
+      - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - distribution-check-bootup

diff --git a/jjb/integration/distribution/distribution-macros.yaml b/jjb/integration/distribution/distribution-macros.yaml
index bab7b0742b76cab6d48d5b7464bc43b5431bf641..741807c323f6dab57bd97497680cd6b8fde5b84d 100644 (file)
--- a/jjb/integration/distribution/distribution-macros.yaml
+++ b/jjb/integration/distribution/distribution-macros.yaml
@@ -230,7 +230,7 @@
     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 bug9191 log without us crating it in $WORKSPACE/.
     builders:
       - shell: |
           # No failure in this macro should affect the job result.
@@ -244,6 +244,26 @@
           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 bug9192 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/bug9192.0.log"
+          popd
+          fgrep org.opendaylight bug9192.0.log > "$WORKSPACE/bug9192.1.log"
+          sort -s -t '<' -k 2 "$WORKSPACE/bug9192.1.log" > "$WORKSPACE/bug9192.2.log"
+          sort -u -s -t '<' -k 2 "$WORKSPACE/bug9192.1.log" > "$WORKSPACE/bug9192.3.log"
+          diff -U 999 -b -t -d "$WORKSPACE/bug9192.2.log" "$WORKSPACE/bug9192.3.log" > "$WORKSPACE/bug9192.diff.log"
+          rm -f "$WORKSPACE"/bug9192.?.log
+
 - builder:
     name: distribution-check-bootup
     # Operation: Locally deploy ODL with all fetures, check it is not broken.

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index e3f3a7ed4e6a3ed5dea5708bae1090f81fbb0d22..f4791ba5c6879454a1fcd9bca6f561e1316fc4bd 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -78,6 +78,7 @@
           mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
       - integration-set-variables
       - distribution-check-warn-9191
+      - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - distribution-check-bootup