summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-05-14 01:56:46 +0000
committerBin Yang <bin.yang@windriver.com>2019-05-14 01:56:46 +0000
commiteb21b18b964558a5096e7e3168a142912ba373c5 (patch)
treefba549ba920051ea5224adb69201d06b7f4f02f1
parentc025104c049c6040711c083b8b6628e7ce8f78ac (diff)
Upgrade patch version to 1.3.3
Fix the missing changes to pike and ocata Change-Id: I497efd3624f80b71d82259b7c117c17e340e7c64 Issue-ID: MULTICLOUD-624 Signed-off-by: Bin Yang <bin.yang@windriver.com>
-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
5 files changed, 7 insertions, 7 deletions
diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile
index 3f27f09f..967fabe3 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.2-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.3-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 21066279..dad35f0a 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.2-SNAPSHOT"
-STAGING="1.3.2-STAGING"
+VERSION="1.3.3-SNAPSHOT"
+STAGING="1.3.3-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 f08bff18..550e3307 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.2-SNAPSHOT</version>
+ <version>1.3.3-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 e7275e1c..2477adce 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.2-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.3-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 b3d7c786..bc6302ee 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.2-SNAPSHOT"
-STAGING="1.3.2-STAGING"
+VERSION="1.3.3-SNAPSHOT"
+STAGING="1.3.3-STAGING"
OS_VERSION="pike"
IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"