Merge "Add YANG module check in distribution merge job"

[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 2e3ba043b449673ddaed4363ea73f5e29eae1515..474e9a6d480d2d5afdcf96d3e4b3ffda1d7388a2 100644 (file)
--- a/jjb/integration/distribution/distribution-macros.yaml
+++ b/jjb/integration/distribution/distribution-macros.yaml
@@ -16,9 +16,16 @@
           echo "detecting distribution allowed projects"
           # Some allowed projects cannot be detected in distribution because they do not produce features.
           ALLOW_PROJECTS=(yangtools mdsal openflowjava)
+          if [[ "$KARAF_VERSION" == "odl" ]]; then
           ALLOW_PROJECTS+=(`grep '<groupId>org.opendaylight.' -Rh distribution \
           | sed -e 's%^[ \t]*<groupId>org.opendaylight.%%' \
           | sed -e 's%</groupId>%%' | sort -u`)
+          else
+          # For Managed distro we only look at the features folder
+          ALLOW_PROJECTS+=(`grep '<groupId>org.opendaylight.' -Rh distribution/features \
+          | sed -e 's%^[ \t]*<groupId>org.opendaylight.%%' \
+          | sed -e 's%</groupId>%%' | sort -u`)
+          fi
           echo "Allowed projects are ${ALLOW_PROJECTS[@]}"
           echo "ALLOW_PROJECTS=${ALLOW_PROJECTS[@]}" > allowed_projects.txt
 
@@ -35,11 +42,11 @@
           goals: |
               clean deploy
               dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq -Pmanaged -Punmanaged
+              -Pq
               -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
               {mvn-opts}
           java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx4096m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -87,10 +94,10 @@
           goals: |
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq -Pmanaged -Punmanaged
+              -Pq
               {mvn-opts}
           java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+            - '-Xmx1024m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -192,10 +199,10 @@
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
               -s fake_remotes.xml
-              -Pq -Pmanaged -Punmanaged
+              -Pq
               {mvn-opts}
           java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx4096m -Dmaven.compile.fork=true'
       - shell: |
           rm -rf /tmp/r
           mv /tmp/t /tmp/r
@@ -218,12 +225,12 @@
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
               -s fake_remotes.xml
-              -Pq -Pmananaged -Punmanaged
+              -Pq
               -Dsft.heap.max=4g
               -DskipTests=false
               {mvn-opts}
           java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+            - '-Xmx1024m -Dmaven.compile.fork=true'
 
 - builder:
     name: distribution-check-warn-9191