From 8a6391f5c5ee0a00d450c302398ce368241b413d Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Wed, 29 Apr 2020 10:17:47 +0200 Subject: [PATCH] fix some minor issues - ordmodels/device/pom.xml doppelganger - tox olmUtils patch persistence Signed-off-by: guillaume.lambert Change-Id: I41007a636644275a23db3efe8a094dfe4bf763b2 --- ordmodels/device/pom.xml | 1 - tox.ini | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index 11022ec0b..8ba53e168 100644 --- a/ordmodels/device/pom.xml +++ b/ordmodels/device/pom.xml @@ -73,7 +73,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html {maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties <_exportcontents> org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.link, - org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.links, org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.links,* diff --git a/tox.ini b/tox.ini index 736f12981..1f1db682d 100644 --- a/tox.ini +++ b/tox.ini @@ -22,11 +22,12 @@ commands = #build 1.2.1 sims {py3,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - sh -c "./buildHoneynode.sh" #patch OLM constant to speed up tests, unnecessary for PCE - {py3,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,otnrenderer,topology221,otn-topology,olm221,end2end221}: - sh -c "sed -i' ' 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java" + {py3,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,otnrenderer,topology221,otn-topology,olm221,end2end221}: - sh -c "sed -i'_' 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java" #build controller, source JDK_JAVA_OPTIONS to remove illegal reflective acces warnings introduced by Java11 {py3,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,otnrenderer,topology221,otntopology,olm221,end2end221,gnpy}: - sh -c ". $PWD/reflectwarn.sh && cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip" + {py3,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,otnrenderer,topology221,otn-topology,olm221,end2end221}: - sh -c "mv ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java_ ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java" #patch Karaf exec for the same reason at runtime - {py3,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,otnrenderer,topology221,otntopology,olm221,end2end221,gnpy}: - sh -c "sed -i' ' 's@!/bin/sh@!/bin/sh\'$'\n. $(dirname $0)/../../../../tests/reflectwarn.sh@' ../karaf/target/assembly/bin/karaf" + {py3,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,otnrenderer,topology221,otntopology,olm221,end2end221,gnpy}: - sh -c "sed -i'_' 's@!/bin/sh@!/bin/sh\'$'\n. $(dirname $0)/../../../../tests/reflectwarn.sh@' ../karaf/target/assembly/bin/karaf" #build Lighty if needed {py3,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,otnrenderer,topology221,otntopology,olm221,end2end221,gnpy}: - sh -c 'if [ "$USE_LIGHTY" = "True" ]; then (cd ../lighty && ./build.sh); fi' #run 1.2.1 functional tests -- 2.36.6