diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-05-04 13:56:25 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2021-05-05 16:04:52 -0400 |
| commit | cb862560f21f6cd376a4b3f9fb74615f410f3f29 (patch) | |
| tree | 8697f5e551591dd7d1550d7bd9c11aecc7bc383b | |
| parent | 8ca233394a5a54878ec21c9f5c3f0f868db8f087 (diff) | |
Update versions for Aluminum SR3
Update versions for Aluminum SR3. Updated CSIT scripts to add
workaround for issue with karaf client not exiting. Client
exits on end of file (^d), so need it to see end of file in input
by using it in a pipeline, with empty string as stdin.
Issue-ID: CCSDK-3285
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ic40c2cd138f8f4888aa83dc75ccc1a818d4605b3
| -rw-r--r-- | csit/plans/healthcheck/setup.sh | 8 | ||||
| -rwxr-xr-x | dependencies/pom.xml | 11 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 10 | ||||
| -rw-r--r-- | opendaylight/aluminum/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 |
5 files changed, 21 insertions, 12 deletions
diff --git a/csit/plans/healthcheck/setup.sh b/csit/plans/healthcheck/setup.sh index 327aba21..dddecbf0 100644 --- a/csit/plans/healthcheck/setup.sh +++ b/csit/plans/healthcheck/setup.sh @@ -77,12 +77,12 @@ if [ "$TIME" -ge "$TIME_OUT" ]; then exit 1; fi -num_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | tail -1 | cut -d' ' -f1) +num_bundles=$(docker exec -i ccsdk_odlsli_container sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | tail -1 | cut -d' ' -f1) if [ "$num_bundles" -ge 333 ]; then - num_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | tail -1 | cut -d' ' -f1) - num_failed_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | grep Failure | wc -l) - failed_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | grep Failure) + num_bundles=$(docker exec -i ccsdk_odlsli_container sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | tail -1 | cut -d' ' -f1) + num_failed_bundles=$(docker exec -i ccsdk_odlsli_container sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep Failure | wc -l) + failed_bundles=$(docker exec -i ccsdk_odlsli_container sh -c "echo '' |/opt/opendaylight/current/bin/client bundle:list" | grep Failure) echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles. fi diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 8a5296c2..1a775fb3 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -31,7 +31,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.1.2</version> + <version>2.1.4-SNAPSHOT</version> <scope>import</scope> <type>pom</type> </dependency> @@ -74,6 +74,15 @@ <artifactId>annotations</artifactId> </dependency> <dependency> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + </dependency> + <dependency> + <groupId>com.google.j2objc</groupId> + <artifactId>j2objc-annotations</artifactId> + <version>1.3</version> + </dependency> + <dependency> <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path</artifactId> </dependency> diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 419845f6..662788d2 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -38,13 +38,13 @@ ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all </ccsdk.odl.features> <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra> - <ccsdk.features.version>1.1.4</ccsdk.features.version> - <ccsdk.sli.version>1.2.2</ccsdk.sli.version> - <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> + <ccsdk.features.version>1.1.5-SNAPSHOT</ccsdk.features.version> + <ccsdk.sli.version>1.2.3-SNAPSHOT</ccsdk.sli.version> + <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> - <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version> - <ccsdk.oran.a1adapter.version>1.1.4</ccsdk.oran.a1adapter.version> + <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version> + <ccsdk.oran.a1adapter.version>1.1.5-SNAPSHOT</ccsdk.oran.a1adapter.version> <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks> </properties> diff --git a/opendaylight/aluminum/pom.xml b/opendaylight/aluminum/pom.xml index 85579b1a..bb4759b1 100644 --- a/opendaylight/aluminum/pom.xml +++ b/opendaylight/aluminum/pom.xml @@ -19,7 +19,7 @@ </modules> <properties> - <ccsdk.opendaylight.version>0.13.1</ccsdk.opendaylight.version> + <ccsdk.opendaylight.version>0.13.3</ccsdk.opendaylight.version> </properties> <dependencyManagement> @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>oparent</artifactId> - <version>2.1.3</version> + <version>2.1.4</version> </parent> <groupId>org.onap.ccsdk.distribution</groupId> |