summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-04-26 07:04:10 +0000
committerBin Yang <bin.yang@windriver.com>2019-04-30 06:26:53 +0000
commit44dd8f2c00ee8a6ec5157bc24af6ae0bcb75d9dd (patch)
tree2e35c782cf1b380441f60ce39eeab3a578446a8f
parent8cd7378736fa89f7df943283ff328441b551e0e0 (diff)
Upgrade to 1.3.2
This should be done once 1.3.1 artifacts are released Change-Id: I943b7cd163b3e607e098e2e6c248a3ed4169119c Issue-ID: MULTICLOUD-590 Signed-off-by: Bin Yang <bin.yang@windriver.com>
-rw-r--r--fcaps/docker/Dockerfile2
-rw-r--r--fcaps/docker/build_image.sh4
-rw-r--r--fcaps/pom.xml2
-rw-r--r--lenovo/docker/Dockerfile2
-rwxr-xr-xlenovo/docker/build_image.sh4
-rw-r--r--lenovo/pom.xml2
-rw-r--r--newton/docker/Dockerfile2
-rw-r--r--newton/docker/build_image.sh4
-rw-r--r--newton/pom.xml2
-rw-r--r--ocata/docker/Dockerfile2
-rwxr-xr-xocata/docker/build_image.sh4
-rw-r--r--ocata/pom.xml2
-rw-r--r--pike/docker/Dockerfile2
-rwxr-xr-xpike/docker/build_image.sh4
-rw-r--r--pike/pom.xml2
-rw-r--r--pom.xml2
-rw-r--r--starlingx/docker/Dockerfile2
-rwxr-xr-xstarlingx/docker/build_image.sh4
-rw-r--r--starlingx/pom.xml2
-rw-r--r--version.properties2
-rw-r--r--windriver/docker/Dockerfile2
-rw-r--r--windriver/docker/build_image.sh4
-rw-r--r--windriver/pom.xml2
23 files changed, 30 insertions, 30 deletions
diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile
index 5225a50c..4e5fc311 100644
--- a/fcaps/docker/Dockerfile
+++ b/fcaps/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
RUN apk update && \
apk add uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \
cd /opt/ && \
- wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.3.1-SNAPSHOT" && \
+ wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.3.2-SNAPSHOT" && \
unzip -q -o -B multicloud-openstack-fcaps.zip && \
chmod +x /opt/fcaps/*.sh && \
rm -f multicloud-openstack-fcaps.zip && \
diff --git a/fcaps/docker/build_image.sh b/fcaps/docker/build_image.sh
index de3278a7..ed22f119 100644
--- a/fcaps/docker/build_image.sh
+++ b/fcaps/docker/build_image.sh
@@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.3.1-SNAPSHOT"
-STAGING="1.3.1-STAGING"
+VERSION="1.3.2-SNAPSHOT"
+STAGING="1.3.2-STAGING"
PROJECT="multicloud"
IMAGE="openstack-fcaps"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/fcaps/pom.xml b/fcaps/pom.xml
index 1aba4ea6..7942a842 100644
--- a/fcaps/pom.xml
+++ b/fcaps/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-fcaps</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-fcaps</name>
<description>multicloud for openstack Wind River Titanium Cloud</description>
diff --git a/lenovo/docker/Dockerfile b/lenovo/docker/Dockerfile
index 5ca6f932..b258ec13 100644
--- a/lenovo/docker/Dockerfile
+++ b/lenovo/docker/Dockerfile
@@ -37,7 +37,7 @@ RUN groupadd -r onap && useradd -r -g onap onap
RUN apt-get update && \
apt-get install -y memcached wget unzip gcc libssl-dev && \
cd /opt/ && \
- wget -O multicloud-openstack-lenovo.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-lenovo&e=zip&v=1.3.1-SNAPSHOT" && \
+ wget -O multicloud-openstack-lenovo.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-lenovo&e=zip&v=1.3.2-SNAPSHOT" && \
unzip -q -o -B multicloud-openstack-lenovo.zip && \
chmod +x /opt/lenovo/*.sh &&\
rm -f multicloud-openstack-lenovo.zip &&\
diff --git a/lenovo/docker/build_image.sh b/lenovo/docker/build_image.sh
index 77d9638e..5c34535b 100755
--- a/lenovo/docker/build_image.sh
+++ b/lenovo/docker/build_image.sh
@@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.3.1-SNAPSHOT"
-STAGING="1.3.1-STAGING"
+VERSION="1.3.2-SNAPSHOT"
+STAGING="1.3.2-STAGING"
PROJECT="multicloud"
IMAGE="openstack-lenovo"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/lenovo/pom.xml b/lenovo/pom.xml
index ee75e74b..1ad28be8 100644
--- a/lenovo/pom.xml
+++ b/lenovo/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-lenovo</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-lenovo</name>
<description>multicloud for openstack lenovo thinkcloud</description>
diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile
index 15b770a7..33dc774b 100644
--- a/newton/docker/Dockerfile
+++ b/newton/docker/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update && \
apt-get install -y memcached && \
apt-get install -y unzip && \
cd /opt/ && \
- wget -O multicloud-openstack-newton.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-newton&e=zip&v=1.3.1-SNAPSHOT" && \
+ wget -O multicloud-openstack-newton.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-newton&e=zip&v=1.3.2-SNAPSHOT" && \
unzip -q -o -B multicloud-openstack-newton.zip && \
chmod +x /opt/newton/*.sh && \
rm -f multicloud-openstack-newton.zip && \
diff --git a/newton/docker/build_image.sh b/newton/docker/build_image.sh
index e467465b..02856107 100644
--- a/newton/docker/build_image.sh
+++ b/newton/docker/build_image.sh
@@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.3.1-SNAPSHOT"
-STAGING="1.3.1-STAGING"
+VERSION="1.3.2-SNAPSHOT"
+STAGING="1.3.2-STAGING"
PROJECT="multicloud"
IMAGE="openstack-newton"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/newton/pom.xml b/newton/pom.xml
index 732044a2..3fece162 100644
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-newton</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-newton</name>
<description>multicloud for openstack newton</description>
diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile
index 8bebf724..3f27f09f 100644
--- a/ocata/docker/Dockerfile
+++ b/ocata/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN groupadd -r onap && useradd -r -g onap onap
RUN apt-get update && \
apt-get install -y memcached wget unzip gcc libssl-dev && \
cd /opt/ && \
- wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=1.3.1-SNAPSHOT" && \
+ wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=1.3.2-SNAPSHOT" && \
unzip -q -o -B /opt/multicloud-openstack-ocata.zip -d /opt/ && \
rm -f /opt/multicloud-openstack-ocata.zip && \
pip install -r /opt/ocata/requirements.txt && \
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index 20a884e7..21066279 100755
--- a/ocata/docker/build_image.sh
+++ b/ocata/docker/build_image.sh
@@ -19,8 +19,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
-VERSION="1.3.1-SNAPSHOT"
-STAGING="1.3.1-STAGING"
+VERSION="1.3.2-SNAPSHOT"
+STAGING="1.3.2-STAGING"
OS_VERSION="ocata"
IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
diff --git a/ocata/pom.xml b/ocata/pom.xml
index ebd79786..f08bff18 100644
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-ocata</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-ocata</name>
<description>multicloud for openstack ocata</description>
diff --git a/pike/docker/Dockerfile b/pike/docker/Dockerfile
index 8998fb08..e7275e1c 100644
--- a/pike/docker/Dockerfile
+++ b/pike/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN groupadd -r onap && useradd -r -g onap onap
RUN apt-get update && \
apt-get install -y memcached wget unzip gcc libssl-dev && \
cd /opt/ && \
- wget -O /opt/multicloud-openstack-pike.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-pike&e=zip&v=1.3.1-SNAPSHOT" && \
+ wget -O /opt/multicloud-openstack-pike.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-pike&e=zip&v=1.3.2-SNAPSHOT" && \
unzip -q -o -B /opt/multicloud-openstack-pike.zip -d /opt/ && \
rm -f /opt/multicloud-openstack-pike.zip && \
pip install -r /opt/pike/requirements.txt && \
diff --git a/pike/docker/build_image.sh b/pike/docker/build_image.sh
index 974fb7a6..b3d7c786 100755
--- a/pike/docker/build_image.sh
+++ b/pike/docker/build_image.sh
@@ -20,8 +20,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
-VERSION="1.3.1-SNAPSHOT"
-STAGING="1.3.1-STAGING"
+VERSION="1.3.2-SNAPSHOT"
+STAGING="1.3.2-STAGING"
OS_VERSION="pike"
IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
diff --git a/pike/pom.xml b/pike/pom.xml
index 3d0f60fe..dfd548d2 100644
--- a/pike/pom.xml
+++ b/pike/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-pike</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-pike</name>
<description>multicloud for openstack pike</description>
diff --git a/pom.xml b/pom.xml
index 0cc1bc17..71cfb488 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-root</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<name>multicloud-openstack</name>
<packaging>pom</packaging>
<description>multicloud openstack</description>
diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile
index 2f0590db..3c0acdbd 100644
--- a/starlingx/docker/Dockerfile
+++ b/starlingx/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
RUN apk update && \
apk add bash uwsgi curl memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \
cd /opt/ && \
- wget -O /opt/multicloud-openstack-starlingx.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-starlingx&e=zip&v=1.3.1-SNAPSHOT" && \
+ wget -O /opt/multicloud-openstack-starlingx.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-starlingx&e=zip&v=1.3.2-SNAPSHOT" && \
unzip -q -o -B /opt/multicloud-openstack-starlingx.zip -d /opt/ && \
rm -f /opt/multicloud-openstack-starlingx.zip && \
pip install -r /opt/starlingx/requirements.txt && \
diff --git a/starlingx/docker/build_image.sh b/starlingx/docker/build_image.sh
index 34359d84..21403a7e 100755
--- a/starlingx/docker/build_image.sh
+++ b/starlingx/docker/build_image.sh
@@ -20,8 +20,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
-VERSION="1.3.1-SNAPSHOT"
-STAGING="1.3.1-STAGING"
+VERSION="1.3.2-SNAPSHOT"
+STAGING="1.3.2-STAGING"
OS_VERSION="starlingx"
IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
diff --git a/starlingx/pom.xml b/starlingx/pom.xml
index 187c4975..d20f7c51 100644
--- a/starlingx/pom.xml
+++ b/starlingx/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-starlingx</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-starlingx</name>
<description>multicloud for openstack starlingx</description>
diff --git a/version.properties b/version.properties
index 43763563..6c7fe66d 100644
--- a/version.properties
+++ b/version.properties
@@ -18,7 +18,7 @@
major=1
minor=3
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index d5389220..013f044c 100644
--- a/windriver/docker/Dockerfile
+++ b/windriver/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
RUN apk update && \
apk add uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \
cd /opt/ && \
- wget -O multicloud-openstack-windriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-windriver&e=zip&v=1.3.1-SNAPSHOT" && \
+ wget -O multicloud-openstack-windriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-windriver&e=zip&v=1.3.2-SNAPSHOT" && \
unzip -q -o -B multicloud-openstack-windriver.zip && \
chmod +x /opt/windriver/*.sh && \
rm -f multicloud-openstack-windriver.zip && \
diff --git a/windriver/docker/build_image.sh b/windriver/docker/build_image.sh
index 003705de..a03810c8 100644
--- a/windriver/docker/build_image.sh
+++ b/windriver/docker/build_image.sh
@@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.3.1-SNAPSHOT"
-STAGING="1.3.1-STAGING"
+VERSION="1.3.2-SNAPSHOT"
+STAGING="1.3.2-STAGING"
PROJECT="multicloud"
IMAGE="openstack-windriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 65515b5f..17f6b6d7 100644
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-windriver</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-windriver</name>
<description>multicloud for openstack Wind River Titanium Cloud</description>