diff options
| -rw-r--r-- | admportal/pom.xml | 1 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 108 | ||||
| -rw-r--r-- | installation/sdnc/src/main/scripts/installFeatures.sh | 17 | ||||
| -rw-r--r-- | platform-logic/installer/pom.xml | 1 | ||||
| -rw-r--r-- | platform-logic/pom.xml | 2 | ||||
| -rw-r--r-- | platform-logic/restapi-templates/pom.xml | 2 | ||||
| -rwxr-xr-x | pom.xml | 6 | ||||
| -rw-r--r-- | version.properties | 2 |
8 files changed, 109 insertions, 30 deletions
diff --git a/admportal/pom.xml b/admportal/pom.xml index 8ec41ea4..aa0d5287 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -7,6 +7,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> <version>1.0.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.sdnc.oam</groupId> diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 2b4cb107..330ac8c4 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -14,17 +14,49 @@ <artifactId>installation-sdnc</artifactId> <version>1.3.1-SNAPSHOT</version> - <name>sdnc-oam :: installation :: ${project.artifactId}</name> + <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates SDN Controller Docker container</description> <properties> <image.name>onap/sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> - <sdnc.northbound.version>1.3.1-SNAPSHOT</sdnc.northbound.version> + <sdnc.northbound.version>1.3.1-SNAPSHOT</sdnc.northbound.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> + <dependencies> + <dependency> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>generic-resource-api-installer</artifactId> + <version>${sdnc.northbound.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>vnfapi-installer</artifactId> + <version>${sdnc.northbound.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>vnftools-installer</artifactId> + <version>${sdnc.northbound.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ansible-adapter-installer</artifactId> + <version>${ccsdk.sli.adaptors.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>lcm-installer</artifactId> + <version>${ccsdk.sli.northbound.version}</version> + <type>zip</type> + </dependency> + </dependencies> <build> <plugins> @@ -44,18 +76,16 @@ println project.properties['sdnc.project.version']; def versionArray; if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); + versionArray = project.properties['sdnc.project.version'].split('\\.'); } if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } - println 'New Tag for docker:' + - project.properties['project.docker.latesttag.version']; + println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; </source> </configuration> </execution> @@ -229,29 +259,59 @@ </executions> </plugin> <plugin> - <artifactId>exec-maven-plugin</artifactId> - <groupId>org.codehaus.mojo</groupId> - <version>1.5.0</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.2</version> <executions> - <execution> - <id>Get features</id> + <id>unpack-sdnc-features</id> <phase>generate-sources</phase> <goals> - <goal>exec</goal> + <goal>unpack-dependencies</goal> </goals> <configuration> - <executable>/bin/bash</executable> - <environmentVariables> - <SDNC_NORTHBOUND_VERSION>${sdnc.northbound.version}</SDNC_NORTHBOUND_VERSION> - <SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION> - </environmentVariables> - <arguments> - <argument>${basedir}/src/main/scripts/installZips.sh</argument> - <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> - </arguments> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/features</outputDirectory> + <includeGroupIds>org.onap.sdnc</includeGroupIds> + <excludeTransitive>true</excludeTransitive> + </configuration> + </execution> + <execution> + <id>unpack-extra-ccsdk-features</id> + <phase>generate-sources</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/features</outputDirectory> + <includeGroupIds>org.onap.ccsdk</includeGroupIds> + <excludeTransitive>true</excludeTransitive> </configuration> </execution> + <execution> + <id>unpack dgs</id> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>platform-logic-installer</artifactId> + <version>${project.version}</version> + <type>zip</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <version>1.5.0</version> + <executions> <execution> <id>change shell permissions</id> diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh index 66c09b2e..b9763630 100644 --- a/installation/sdnc/src/main/scripts/installFeatures.sh +++ b/installation/sdnc/src/main/scripts/installFeatures.sh @@ -25,8 +25,13 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} +CCSDK_FEATURE_DIR=${CCSDK_FEATURE_DIR:-${CCSDK_HOME}/features} SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features} +CCSDK_EXTRAS=" \ + ansible-adapter \ + lcm" + SDNC_NORTHBOUND_FEATURES=" \ @@ -40,6 +45,18 @@ SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.3.1-SNAPSHOT} # Install CCSDK features ${CCSDK_HOME}/bin/installCcsdkFeatures.sh +# Install CCSDK extras, used by SDNC but not APP-C +echo "Installing CCSDK extras" +for feature in ${CCSDK_FEATURES} +do + if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ] + then + ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh + else + echo "No installer found for ${feature}" + fi +done + echo "Installing SDN-C northbound" for feature in ${SDNC_NORTHBOUND_FEATURES} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index d5208944..adba71e4 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -6,6 +6,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>1.0.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.sdnc.oam</groupId> diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 298b52fc..6bafb25a 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic</name> diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 0ada96fe..07f7b5db 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -12,7 +12,7 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-restapi-templates</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-carbon-sr1</artifactId> - <version>0.1.0</version> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam</name> diff --git a/version.properties b/version.properties index 1dcc37c2..9614fbff 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=3 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} |