summaryrefslogtreecommitdiffstats
path: root/vio
diff options
context:
space:
mode:
Diffstat (limited to 'vio')
-rw-r--r--vio/docker/Dockerfile2
-rwxr-xr-xvio/docker/build_image.sh4
-rw-r--r--vio/pom.xml59
-rwxr-xr-xvio/sonar.sh3
-rw-r--r--vio/version.properties2
5 files changed, 60 insertions, 10 deletions
diff --git a/vio/docker/Dockerfile b/vio/docker/Dockerfile
index 8253270..2bd40aa 100644
--- a/vio/docker/Dockerfile
+++ b/vio/docker/Dockerfile
@@ -17,7 +17,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
RUN apk update && \
apk add uwsgi unzip wget curl gcc make libc-dev libffi-dev openssl-dev && \
cd /opt/ && \
- wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=1.4.0-SNAPSHOT&e=zip' && \
+ wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=1.4.1-SNAPSHOT&e=zip' && \
unzip multicloud-vio.zip && \
rm -rf multicloud-vio.zip && \
pip install -r /opt/vio/requirements.txt && \
diff --git a/vio/docker/build_image.sh b/vio/docker/build_image.sh
index 2a40090..729a860 100755
--- a/vio/docker/build_image.sh
+++ b/vio/docker/build_image.sh
@@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.4.0-SNAPSHOT"
-STAGING="1.4.0-STAGING"
+VERSION="1.4.1-SNAPSHOT"
+STAGING="1.4.1-STAGING"
PROJECT="multicloud"
IMAGE="vio"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/vio/pom.xml b/vio/pom.xml
index 260bdab..1209357 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -15,14 +15,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent</artifactId>
- <version>2.0.0</version>
+ <groupId>org.onap.multicloud.openstack.vmware</groupId>
+ <artifactId>multicloud-openstack-vmware-root</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack.vmware</groupId>
<artifactId>multicloud-openstack-vmware</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-vmware</name>
<description>multicloud openstack vmware vio</description>
@@ -42,8 +42,59 @@
<sonar.exclusions>**/tests/*,setup.py</sonar.exclusions>
</properties>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <configuration>
+ <executable>${project.basedir}/sonar.sh</executable>
+ <environmentVariables>
+ <!-- make mvn properties as env for our script -->
+ <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+ <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+ <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>clean phase script</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <arguments>
+ <argument>__</argument>
+ <argument>clean</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test script</id>
+ <phase>test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <arguments>
+ <argument>__</argument>
+ <argument>test</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
diff --git a/vio/sonar.sh b/vio/sonar.sh
index 91f09f0..941f1a9 100755
--- a/vio/sonar.sh
+++ b/vio/sonar.sh
@@ -45,7 +45,6 @@ echo "MVN_PROJECT_VERSION is [$MVN_PROJECT_VERSION]"
run_tox_test()
{
set -x
- cd vio
CURDIR=$(pwd)
TOXINIS=$(find . -name "tox.ini")
cd ..
@@ -58,7 +57,7 @@ run_tox_test()
pip install --upgrade pip
pip install --upgrade tox argparse
pip freeze
- cd vio
+ cd ${CURDIR}
tox -e cover
deactivate
cd ..
diff --git a/vio/version.properties b/vio/version.properties
index 8081980..7694f9c 100644
--- a/vio/version.properties
+++ b/vio/version.properties
@@ -19,7 +19,7 @@
major=1
minor=4
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}