summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-05-28 08:46:13 +0000
committerBin Yang <bin.yang@windriver.com>2019-05-28 08:46:13 +0000
commitc552ae8b51d3fdae4cfc4cf7a4e996f62fd348db (patch)
tree94b3b43edf0f5288dc431dafd9c5a97815957d4a
parent18d97d784f69ee5fd517a5d0f9c6d007a8d40396 (diff)
Upgrade version to 1.3.5 after releasing 1.3.4
Change-Id: I123fd78aace2c14b31fd042bbffed24645d18435 Issue-ID: MULTICLOUD-658 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 791f03bb..0a07064b 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.4-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.5-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 5b86d375..e61911ff 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.4-SNAPSHOT"
-STAGING="1.3.4-STAGING"
+VERSION="1.3.5-SNAPSHOT"
+STAGING="1.3.5-STAGING"
PROJECT="multicloud"
IMAGE="openstack-fcaps"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/fcaps/pom.xml b/fcaps/pom.xml
index 519cbdb1..26f7cffd 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.4-SNAPSHOT</version>
+ <version>1.3.5-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 fe54b479..4926fffd 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.4-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.5-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 b675d5ca..7f813fe0 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.4-SNAPSHOT"
-STAGING="1.3.4-STAGING"
+VERSION="1.3.5-SNAPSHOT"
+STAGING="1.3.5-STAGING"
PROJECT="multicloud"
IMAGE="openstack-lenovo"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/lenovo/pom.xml b/lenovo/pom.xml
index a2d829be..f000a1a1 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.4-SNAPSHOT</version>
+ <version>1.3.5-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 1fcaadf2..f40c786b 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.4-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.5-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 01f26484..67523347 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.4-SNAPSHOT"
-STAGING="1.3.4-STAGING"
+VERSION="1.3.5-SNAPSHOT"
+STAGING="1.3.5-STAGING"
PROJECT="multicloud"
IMAGE="openstack-newton"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/newton/pom.xml b/newton/pom.xml
index 4758d9c5..6f62e9f2 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.4-SNAPSHOT</version>
+ <version>1.3.5-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 bff45a7e..be2e3568 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.4-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.5-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 765bb35f..5c74e307 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.4-SNAPSHOT"
-STAGING="1.3.4-STAGING"
+VERSION="1.3.5-SNAPSHOT"
+STAGING="1.3.5-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 d46bc175..ee324a66 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.4-SNAPSHOT</version>
+ <version>1.3.5-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 819a745f..e166de19 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.4-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.5-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 5e6996dd..06057f0c 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.4-SNAPSHOT"
-STAGING="1.3.4-STAGING"
+VERSION="1.3.5-SNAPSHOT"
+STAGING="1.3.5-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 9caea884..ca188bf3 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.4-SNAPSHOT</version>
+ <version>1.3.5-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 465f77c8..f92b76f7 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.4-SNAPSHOT</version>
+ <version>1.3.5-SNAPSHOT</version>
<name>multicloud-openstack</name>
<packaging>pom</packaging>
<description>multicloud openstack</description>
diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile
index ee627bef..6d638f0e 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.4-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.5-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 7650fa4e..a738f328 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.4-SNAPSHOT"
-STAGING="1.3.4-STAGING"
+VERSION="1.3.5-SNAPSHOT"
+STAGING="1.3.5-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 46ebeb56..b4f70ff9 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.4-SNAPSHOT</version>
+ <version>1.3.5-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 74f25173..25f98e43 100644
--- a/version.properties
+++ b/version.properties
@@ -18,7 +18,7 @@
major=1
minor=3
-patch=4
+patch=5
base_version=${major}.${minor}.${patch}
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index e413302f..6740bca5 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.4-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.5-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 be8155cf..515723a4 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.4-SNAPSHOT"
-STAGING="1.3.4-STAGING"
+VERSION="1.3.5-SNAPSHOT"
+STAGING="1.3.5-STAGING"
PROJECT="multicloud"
IMAGE="openstack-windriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/windriver/pom.xml b/windriver/pom.xml
index c68d6267..0a3cda19 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.4-SNAPSHOT</version>
+ <version>1.3.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-windriver</name>
<description>multicloud for openstack Wind River Titanium Cloud</description>