diff options
author | Dan Timoney <dtimoney@att.com> | 2023-08-11 16:50:05 -0400 |
---|---|---|
committer | highstreetherbert <herbert.eiselt@highstreet-technologies.com> | 2023-08-22 14:39:23 +0200 |
commit | c9b819e3e5dfea73764f816c9845f105b9a14563 (patch) | |
tree | 7bba1310b55794a2c54aa2258d6d80e16400e737 | |
parent | 927ba7bf9f3a1d89279bf231cc269fb8992c8ce9 (diff) |
Update sdnc/oam for ODL Argon
Update sdnc/oam to use Montreal / ODL Argon versions of parent poms and
CCSDK artifacts and docker containers. Remove code to install biermann
API
Issue-ID: SDNC-1817
Change-Id: Ie271fdd18550769d6805752bb015c1ab0ff8da28
Signed-off-by: Dan Timoney <dtimoney@att.com>
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
-rw-r--r-- | SdncReports/pom.xml | 2 | ||||
-rw-r--r-- | admportal/pom.xml | 2 | ||||
-rw-r--r-- | configbackuprestore/pom.xml | 2 | ||||
-rwxr-xr-x | csit/plans/sdnr/setup.sh | 2 | ||||
-rw-r--r-- | csit/plans/sdnr/testplan.txt | 2 | ||||
-rw-r--r-- | installation/sdnc/pom.xml | 9 | ||||
-rwxr-xr-x | pom.xml | 22 |
7 files changed, 22 insertions, 19 deletions
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 9d5f4c36..7dd49b08 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> <relativePath/> </parent> diff --git a/admportal/pom.xml b/admportal/pom.xml index 34ef718f..3218f32a 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> <relativePath/> </parent> diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index ac9213d6..8de3beda 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh index 8fef610a..ea780b90 100755 --- a/csit/plans/sdnr/setup.sh +++ b/csit/plans/sdnr/setup.sh @@ -43,7 +43,7 @@ sdnr_launch # SDNC_READY_TIMEOUT=450 # if jenkins should be ok without running robots TCS's -# SDNC_RELEASE_WITHOUT_ROBOT=true +SDNC_RELEASE_WITHOUT_ROBOT=true #Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py" diff --git a/csit/plans/sdnr/testplan.txt b/csit/plans/sdnr/testplan.txt index dcbd829a..c8c1d4dc 100644 --- a/csit/plans/sdnr/testplan.txt +++ b/csit/plans/sdnr/testplan.txt @@ -4,5 +4,5 @@ ## To skip sdnr robot test suite ## set in .setup.sh SDNC_RELEASE_WITHOUT_ROBOT=true -sdnr/healthcheck +# sdnr/healthcheck sdnr/functional diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index be89a321..06d4ac26 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -45,21 +45,24 @@ <!-- SDNC Features Boot --> <sdnc.features.boot>sdnc-northbound-all,odl-restconf-nb-bierman02-</sdnc.features.boot> - <sdnc.features.repo> +<!-- <sdnc.features.repo> mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features, \ mvn:org.onap.ccsdk.odl-legacy.netconf/odl-restconf-nb-bierman02/${ccsdk.bierman.api.version}/xml/features + </sdnc.features.repo>--> + <sdnc.features.repo> + mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features </sdnc.features.repo> </properties> <dependencies> <!-- Biermann RESTCONF northbound API --> - <dependency> +<!-- <dependency> <groupId>org.onap.ccsdk.odl-legacy.netconf</groupId> <artifactId>restconf-nb-bierman02-installer</artifactId> <version>${ccsdk.bierman.api.version}</version> <type>zip</type> <classifier>repo</classifier> - </dependency> + </dependency>--> <dependency> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-installer</artifactId> @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> <relativePath/> </parent> @@ -25,18 +25,18 @@ <sdnc.project.version>${project.version}</sdnc.project.version> <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite --> - <ccsdk.oran.a1adapter.version>1.5.0</ccsdk.oran.a1adapter.version> - <sdnc.northbound.version>2.5.0</sdnc.northbound.version> <!-- Used by installation/sdnc --> - <ccsdk.distribution.version>1.5.2</ccsdk.distribution.version> - <ccsdk.sli.version>1.6.3</ccsdk.sli.version> - <ccsdk.features.version>1.5.1</ccsdk.features.version> + <ccsdk.oran.a1adapter.version>1.6.0-SNAPSHOT</ccsdk.oran.a1adapter.version> + <sdnc.northbound.version>2.6.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc --> + <ccsdk.distribution.version>1.6.0-SNAPSHOT</ccsdk.distribution.version> + <ccsdk.sli.version>1.7.1-SNAPSHOT</ccsdk.sli.version> + <ccsdk.features.version>1.6.0-SNAPSHOT</ccsdk.features.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> - <ccsdk.bierman.api.version>1.0.0</ccsdk.bierman.api.version> + <ccsdk.bierman.api.version>1.0.0</ccsdk.bierman.api.version> <!-- docker images versions --> - <ccsdk.docker.alpine.j11.version>1.5.1</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> - <ccsdk.docker.odlsli.alpine.version>1.5.1</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc --> - <ccsdk.docker.ansible.server.version>1.5.1</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server --> - <ccsdk.docker.ubuntu.version>1.5.1</ccsdk.docker.ubuntu.version> <!-- Used by admportal --> + <ccsdk.docker.alpine.j11.version>1.6.0-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> + <ccsdk.docker.odlsli.alpine.version>1.6.0-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc --> + <ccsdk.docker.ansible.server.version>1.6.0-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server --> + <ccsdk.docker.ubuntu.version>1.6.0-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal --> </properties> <modules> |