From c025104c049c6040711c083b8b6628e7ce8f78ac Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Tue, 14 May 2019 01:13:16 +0000 Subject: Upgrade patch version to 1.3.3 Change-Id: I7d387a26a283cb11e91b483a94551f9713c790f6 Issue-ID: MULTICLOUD-624 Signed-off-by: Bin Yang --- fcaps/docker/Dockerfile | 2 +- fcaps/docker/build_image.sh | 4 ++-- fcaps/pom.xml | 2 +- lenovo/docker/Dockerfile | 2 +- lenovo/docker/build_image.sh | 4 ++-- lenovo/pom.xml | 2 +- newton/docker/Dockerfile | 2 +- newton/docker/build_image.sh | 4 ++-- newton/pom.xml | 2 +- pike/pom.xml | 2 +- pom.xml | 2 +- starlingx/docker/Dockerfile | 2 +- starlingx/docker/build_image.sh | 4 ++-- starlingx/pom.xml | 2 +- version.properties | 2 +- windriver/docker/Dockerfile | 2 +- windriver/docker/build_image.sh | 4 ++-- windriver/pom.xml | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile index 4e5fc311..c08552db 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.2-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.3-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 ed22f119..3ead51e3 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.2-SNAPSHOT" -STAGING="1.3.2-STAGING" +VERSION="1.3.3-SNAPSHOT" +STAGING="1.3.3-STAGING" PROJECT="multicloud" IMAGE="openstack-fcaps" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/fcaps/pom.xml b/fcaps/pom.xml index 7942a842..c1d41a10 100644 --- a/fcaps/pom.xml +++ b/fcaps/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-fcaps - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-openstack-fcaps multicloud for openstack Wind River Titanium Cloud diff --git a/lenovo/docker/Dockerfile b/lenovo/docker/Dockerfile index b258ec13..768b151c 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.2-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.3-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 5c34535b..e3520884 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.2-SNAPSHOT" -STAGING="1.3.2-STAGING" +VERSION="1.3.3-SNAPSHOT" +STAGING="1.3.3-STAGING" PROJECT="multicloud" IMAGE="openstack-lenovo" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/lenovo/pom.xml b/lenovo/pom.xml index 1ad28be8..e6732660 100644 --- a/lenovo/pom.xml +++ b/lenovo/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-lenovo - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-openstack-lenovo multicloud for openstack lenovo thinkcloud diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile index 33dc774b..0c69da39 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.2-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.3-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 02856107..3ab6d9f6 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.2-SNAPSHOT" -STAGING="1.3.2-STAGING" +VERSION="1.3.3-SNAPSHOT" +STAGING="1.3.3-STAGING" PROJECT="multicloud" IMAGE="openstack-newton" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/newton/pom.xml b/newton/pom.xml index 3fece162..8276179a 100644 --- a/newton/pom.xml +++ b/newton/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-newton - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-openstack-newton multicloud for openstack newton diff --git a/pike/pom.xml b/pike/pom.xml index dfd548d2..f1eb9c4b 100644 --- a/pike/pom.xml +++ b/pike/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-pike - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-openstack-pike multicloud for openstack pike diff --git a/pom.xml b/pom.xml index 71cfb488..091f8f0d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-root - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT multicloud-openstack pom multicloud openstack diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile index 3c0acdbd..e2fbf960 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.2-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.3-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 21403a7e..11ce0968 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.2-SNAPSHOT" -STAGING="1.3.2-STAGING" +VERSION="1.3.3-SNAPSHOT" +STAGING="1.3.3-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 d20f7c51..ee324741 100644 --- a/starlingx/pom.xml +++ b/starlingx/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-starlingx - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-openstack-starlingx multicloud for openstack starlingx diff --git a/version.properties b/version.properties index 6c7fe66d..ec8e00ed 100644 --- a/version.properties +++ b/version.properties @@ -18,7 +18,7 @@ major=1 minor=3 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile index 013f044c..71ebef4d 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.2-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.3-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 a03810c8..a122a14d 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.2-SNAPSHOT" -STAGING="1.3.2-STAGING" +VERSION="1.3.3-SNAPSHOT" +STAGING="1.3.3-STAGING" PROJECT="multicloud" IMAGE="openstack-windriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/windriver/pom.xml b/windriver/pom.xml index 17f6b6d7..7cb71170 100644 --- a/windriver/pom.xml +++ b/windriver/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-windriver - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-openstack-windriver multicloud for openstack Wind River Titanium Cloud -- cgit 1.2.3-korg