Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "CI!: Upgrade maven version to mvn38"
[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..974382e2f29269c01dc9ae990a76f15db9456c92 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)
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`)
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
echo "Allowed projects are ${ALLOW_PROJECTS[@]}"
echo "ALLOW_PROJECTS=${ALLOW_PROJECTS[@]}" > allowed_projects.txt
@@
-30,19
+37,19
@@
# pom: Relative path to pom file to use. Typically '$GERRIT_PROJECT/pom.xml'.
builders:
- maven-target:
# pom: Relative path to pom file to use. Typically '$GERRIT_PROJECT/pom.xml'.
builders:
- maven-target:
- maven-version:
'{mvn-version}'
- pom:
'{pom}'
+ maven-version:
"{mvn-version}"
+ pom:
"{pom}"
goals: |
goals: |
-
clean deploy
-
dependency:tree -DoutputFile=dependency_tree.txt
- -Pq -Pmanaged -Punmanaged
-
-DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
-
{mvn-opts}
+ clean deploy
+ dependency:tree -DoutputFile=dependency_tree.txt
+ -Pq
+ -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
+ {mvn-opts}
java-opts:
java-opts:
- -
'-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
- settings:
'integration-settings'
+ -
"-Xmx4096m -Dmaven.compile.fork=true"
+ settings:
"integration-settings"
settings-type: cfp
settings-type: cfp
- global-settings:
'global-settings'
+ global-settings:
"global-settings"
global-settings-type: cfp
- builder:
global-settings-type: cfp
- builder:
@@
-82,18
+89,18
@@
# dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
builders:
- maven-target:
# dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
builders:
- maven-target:
- maven-version:
'{mvn-version}'
- pom:
'{dist-pom}'
+ maven-version:
"{mvn-version}"
+ pom:
"{dist-pom}"
goals: |
goals: |
-
clean install
-
dependency:tree -DoutputFile=dependency_tree.txt
- -Pq -Pmanaged -Punmanaged
-
{mvn-opts}
+ clean install
+ dependency:tree -DoutputFile=dependency_tree.txt
+ -Pq
+ {mvn-opts}
java-opts:
java-opts:
- -
'-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
- settings:
'integration-settings'
+ -
"-Xmx1024m -Dmaven.compile.fork=true"
+ settings:
"integration-settings"
settings-type: cfp
settings-type: cfp
- global-settings:
'global-settings'
+ global-settings:
"global-settings"
global-settings-type: cfp
- builder:
global-settings-type: cfp
- builder:
@@
-186,16
+193,16
@@
- shell: |
cp -r /tmp/r /tmp/t
- maven-target:
- shell: |
cp -r /tmp/r /tmp/t
- maven-target:
- maven-version:
'{mvn-version}'
- pom:
'{pom}'
+ maven-version:
"{mvn-version}"
+ pom:
"{pom}"
goals: |
goals: |
-
clean install
-
dependency:tree -DoutputFile=dependency_tree.txt
-
-s fake_remotes.xml
- -Pq -Pmanaged -Punmanaged
-
{mvn-opts}
+ clean install
+ dependency:tree -DoutputFile=dependency_tree.txt
+ -s fake_remotes.xml
+ -Pq
+ {mvn-opts}
java-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
- shell: |
rm -rf /tmp/r
mv /tmp/t /tmp/r
@@
-212,18
+219,18
@@
# dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
builders:
- maven-target:
# dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
builders:
- maven-target:
- maven-version:
'{mvn-version}'
- pom:
'{dist-pom}'
+ maven-version:
"{mvn-version}"
+ pom:
"{dist-pom}"
goals: |
goals: |
-
clean install
-
dependency:tree -DoutputFile=dependency_tree.txt
-
-s fake_remotes.xml
- -Pq -Pmananaged -Punmanaged
-
-Dsft.heap.max=4g
-
-DskipTests=false
-
{mvn-opts}
+ clean install
+ dependency:tree -DoutputFile=dependency_tree.txt
+ -s fake_remotes.xml
+ -Pq
+ -Dsft.heap.max=4g
+ -DskipTests=false
+ {mvn-opts}
java-opts:
java-opts:
- -
'-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+ -
"-Xmx1024m -Dmaven.compile.fork=true"
- builder:
name: distribution-check-warn-9191
- builder:
name: distribution-check-warn-9191