summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaohua Zhang <xiaohua.zhang@windriver.com>2019-01-09 04:34:46 +0000
committerXiaohua Zhang <xiaohua.zhang@windriver.com>2019-01-09 04:34:46 +0000
commit9016411d86d8bf768922ffcaa989bf657f9dd2b7 (patch)
tree631a66fa4869fd8207ab31dee486d2d3974549ae
parente628d07247f788d20c06e8d310070a5bc66917f7 (diff)
Upgrade to 1.3.0 for dublin
Change-Id: I9a42f70d1df743cb3c7cfc95a402bce9eade4469 Issue-ID: MULTICLOUD-432 Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
-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--version.properties4
-rw-r--r--windriver/docker/Dockerfile2
-rw-r--r--windriver/docker/build_image.sh4
-rw-r--r--windriver/pom.xml2
14 files changed, 19 insertions, 19 deletions
diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile
index ce6ea333..c43311e8 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.2.3-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.0-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 442968f8..d727d7a5 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.2.3-SNAPSHOT"
-STAGING="1.2.3-STAGING"
+VERSION="1.3.0-SNAPSHOT"
+STAGING="1.3.0-STAGING"
PROJECT="multicloud"
IMAGE="openstack-newton"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/newton/pom.xml b/newton/pom.xml
index c2fd92fd..89987ef3 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.2.3-SNAPSHOT</version>
+ <version>1.3.0-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 e6ce994e..e6525335 100644
--- a/ocata/docker/Dockerfile
+++ b/ocata/docker/Dockerfile
@@ -33,7 +33,7 @@ EXPOSE 9006
WORKDIR /opt/ocata
RUN apt-get update && apt-get install -y memcached unzip rabbitmq-server
-RUN 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.2.3-SNAPSHOT" && \
+RUN 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.0-SNAPSHOT" && \
unzip -q -o -B /opt/multicloud-openstack-ocata.zip -d /opt/ && \
rm -f /opt/multicloud-openstack-ocata.zip
RUN mkdir -p /var/log/onap/multicloud/openstack/ocata/
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index 38b2a84b..f2dd6f70 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.2.3-SNAPSHOT"
-STAGING="1.2.3-STAGING"
+VERSION="1.3.0-SNAPSHOT"
+STAGING="1.3.0-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 7ce367ff..99bcc7e4 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.2.3-SNAPSHOT</version>
+ <version>1.3.0-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 2f6bc629..d5cfd85e 100644
--- a/pike/docker/Dockerfile
+++ b/pike/docker/Dockerfile
@@ -33,7 +33,7 @@ EXPOSE 9007
WORKDIR /opt/pike
RUN apt-get update && apt-get install -y memcached unzip
-RUN 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.2.3-SNAPSHOT" && \
+RUN 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.0-SNAPSHOT" && \
unzip -q -o -B /opt/multicloud-openstack-pike.zip -d /opt/ && \
rm -f /opt/multicloud-openstack-pike.zip
RUN mkdir -p /var/log/onap/multicloud/openstack/pike/
diff --git a/pike/docker/build_image.sh b/pike/docker/build_image.sh
index 9f719269..a200907a 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.2.3-SNAPSHOT"
-STAGING="1.2.3-STAGING"
+VERSION="1.3.0-SNAPSHOT"
+STAGING="1.3.0-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 a5cf048a..6f27be22 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.2.3-SNAPSHOT</version>
+ <version>1.3.0-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 95ec3591..19336473 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.2.3-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<name>multicloud-openstack</name>
<packaging>pom</packaging>
<description>multicloud openstack</description>
diff --git a/version.properties b/version.properties
index 1aeae5b0..bb3cd641 100644
--- a/version.properties
+++ b/version.properties
@@ -17,8 +17,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=2
-patch=3
+minor=3
+patch=0
base_version=${major}.${minor}.${patch}
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index f0bd620e..7ec9bb73 100644
--- a/windriver/docker/Dockerfile
+++ b/windriver/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update && \
apt-get install -y rabbitmq-server && \
apt-get install -y unzip && \
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.2.3-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.0-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 2ff6dbbb..d880a4ed 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.2.3-SNAPSHOT"
-STAGING="1.2.3-STAGING"
+VERSION="1.3.0-SNAPSHOT"
+STAGING="1.3.0-STAGING"
PROJECT="multicloud"
IMAGE="openstack-windriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 1af1578f..1b8e89e6 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.2.3-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-windriver</name>
<description>multicloud for openstack Wind River Titanium Cloud</description>