diff options
29 files changed, 119 insertions, 82 deletions
@@ -8,7 +8,7 @@ project_lead: &onap_multicloud_ptl email: 'bin.yang@windriver.com' company: 'Windriver' id: 'biny993' - timezone: 'China/Beijing' + timezone: 'Asia/Shanghai' primary_contact: *onap_multicloud_ptl issue_tracking: type: 'jira' @@ -21,12 +21,12 @@ mailing_list: realtime_discussion: '' meetings: - type: 'zoom' - agenda: 'https://wiki.onap.org/pages/viewpage.action?pageId=6591499' - url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6591499' - server: 'n/a' - channel: 'n/a' - repeats: 'weekly' - time: '13:00 UTC' + agenda: 'https://wiki.onap.org/pages/viewpage.action?pageId=6591499' + url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6591499' + server: 'n/a' + channel: 'n/a' + repeats: 'weekly' + time: '13:00 UTC' repositories: - 'multicloud-framework' - 'multicloud-openstack' @@ -38,51 +38,62 @@ repositories: committers: - <<: *onap_multicloud_ptl - name: 'Anbing Zhang' - email: 'zhanganbing@chinamobile.com' - company: 'China Mobile' - id: 'zhangab' - timezone: '' + email: 'zhanganbing@chinamobile.com' + company: 'China Mobile' + id: 'zhangab' + timezone: 'Asia/Shanghai' - name: 'Xinhui Li' - email: 'lxinhui@vmware.com' - id: 'xinhuili' - company: 'VMware' - timezone: 'China/Beijing' + email: 'lxinhui@vmware.com' + id: 'xinhuili' + company: 'VMware' + timezone: 'Asia/Shanghai' - name: 'Bin Hu' - email: 'bh526r@att.com' - company: 'ATT' - id: 'bh526r' - timezone: 'America/Palo Alto' + email: 'bh526r@att.com' + company: 'ATT' + id: 'bh526r' + timezone: 'America/Los_Angeles' - name: 'Victor Morales' - email: 'victor.morales@intel.com' - company: 'Intel' - id: 'electrocucaracha' - timezone: '' + email: 'victor.morales@intel.com' + company: 'Intel' + id: 'electrocucaracha' + timezone: 'America/Los_Angeles' - name: 'Ethan Lynn' - email: 'ethanlynnl@vmware.com' - company: 'VMWare' - id: 'ethanlynnl' - timezone: '' + email: 'ethanlynnl@vmware.com' + company: 'VMWare' + id: 'ethanlynnl' + timezone: 'Asia/Shanghai' - name: 'Huang Haibin' - email: 'haibin.huang@intel.com' - company: 'Intel' - id: 'haibin' - timezone: '' + email: 'haibin.huang@intel.com' + company: 'Intel' + id: 'haibin' + timezone: 'Asia/Shanghai' - name: 'Sudhakar Reddy' - email: 'Sudhakar.Reddy@amdocs.com' - company: 'Amdocs' - id: 'SudhakarReddy' - timezone: '' + email: 'Sudhakar.Reddy@amdocs.com' + company: 'Amdocs' + id: 'SudhakarReddy' + timezone: 'Asia/Kolkata' + - name: 'Xiaohua Zhang' + email: 'Xiaohua.Zhang@windriver.com' + company: 'Wind River' + id: 'Xiaohua626' + timezone: 'Asia/Shanghai' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: - type: 'Addition' - name: 'yun huang' - name: 'Victor Morales' - name: 'Ethan Lynn' - name: 'Huang Haibin' - name: 'Sudhakar Reddy' + name: + - 'yun huang' + - 'Victor Morales' + - 'Ethan Lynn' + - 'Huang Haibin' + - 'Sudhakar Reddy' link: 'http://ircbot.wl.linuxfoundation.org/meetings/onap-meeting/2018/onap-meeting.2018-08-16-13.45.html' - type: 'Remove' - name: 'yun huang' - name: 'Ke Liang' - name: 'Andrew Philip' + name: + - 'yun huang' + - 'Ke Liang' + - 'Andrew Philip' + link: 'https://lists.onap.org/g/onap-tsc/message/4635' + - type: 'Addition' + name: 'Xiaohua Zhang' + link: 'https://lists.onap.org/g/onap-tsc/message/4772' diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile index 408a6f99..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.0-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 050777b6..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.0-SNAPSHOT" -STAGING="1.3.0-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/fcaps/samples/urls.py b/fcaps/fcaps/samples/urls.py index cadc5f65..59db0795 100644 --- a/fcaps/fcaps/samples/urls.py +++ b/fcaps/fcaps/samples/urls.py @@ -17,4 +17,4 @@ from fcaps.samples import views urlpatterns = [ url(r'^samples/?$', views.SampleList.as_view()), - url(r'^api/multicloud-fcaps/healthcheck/?$', views.SampleList.as_view()), ] + url(r'^api/multicloud-fcaps/v1/healthcheck/?$', views.SampleList.as_view()), ] diff --git a/fcaps/pom.xml b/fcaps/pom.xml index 98f25dbb..c1d41a10 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.0-SNAPSHOT</version> + <version>1.3.3-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 09011351..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.0-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 1e5bffdc..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.0-SNAPSHOT" -STAGING="1.3.0-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 2e586c4e..e6732660 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.0-SNAPSHOT</version> + <version>1.3.3-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 c43311e8..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.0-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 d727d7a5..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.0-SNAPSHOT" -STAGING="1.3.0-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 89987ef3..8276179a 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.0-SNAPSHOT</version> + <version>1.3.3-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 5f9cd2b3..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.0-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 f2dd6f70..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.0-SNAPSHOT" -STAGING="1.3.0-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 99bcc7e4..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.0-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 441ff568..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.0-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 a200907a..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.0-SNAPSHOT" -STAGING="1.3.0-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}" diff --git a/pike/pom.xml b/pike/pom.xml index 6f27be22..f1eb9c4b 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.0-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud-openstack-pike</name> <description>multicloud for openstack pike</description> @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-root</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <name>multicloud-openstack</name> <packaging>pom</packaging> <description>multicloud openstack</description> diff --git a/share/common/msapi/helper.py b/share/common/msapi/helper.py index 69b91953..de8852c8 100644 --- a/share/common/msapi/helper.py +++ b/share/common/msapi/helper.py @@ -281,6 +281,15 @@ class MultiCloudThreadHelper(object): return False + def expire(self, backlog_id): + # important: the order of operation should make sure + # there is at least 1 copy of backlog item in either backlog or expired backlog + # self.lock.acquire() + backlogitem = self.backlog.get(backlog_id, None) + self.owner.expired_backlog[backlog_id] = backlogitem + self.backlog.pop(backlog_id, None) + # self.lock.release() + def remove(self, backlog_id): # self.lock.acquire() self.backlog.pop(backlog_id, None) @@ -345,7 +354,7 @@ class MultiCloudThreadHelper(object): "status": item["status"] } if item.get("repeat", 0) == 0: - self.owner.remove(backlog_id) + self.owner.expire(backlog_id) # keep only the id and status self.owner.expired_backlog[backlog_id] = {"status": item["status"]} diff --git a/share/newton_base/proxy/identityV3.py b/share/newton_base/proxy/identityV3.py index 5d502831..6539943b 100644 --- a/share/newton_base/proxy/identityV3.py +++ b/share/newton_base/proxy/identityV3.py @@ -62,6 +62,12 @@ class Tokens(APIView): self._logger.debug("data> %s" % request.data) self._logger.info("RESP with status> %s" % status.HTTP_200_OK) + + # compose the links + v3_version_detail["version"]["links"] = [{ + "href": request.META.get("REQUEST_URI", ""), + "rel": "self" + }] return Response(data=v3_version_detail, status=status.HTTP_200_OK) def post(self, request, vimid=""): @@ -161,8 +167,8 @@ class Tokens(APIView): v2_version_detail = { "version": { - "status": "stable", - "updated": "2014-04-17T00:00:00Z", + "status": "deprecated", + "updated": "2016-08-04T00:00:00Z", "media-types": [ { "base": "application/json", @@ -171,7 +177,10 @@ v2_version_detail = { ], "id": "v2.0", "links": [ - ] + ], + "type": "text/html", + "rel": "describedby" + } } @@ -189,6 +198,11 @@ class TokensV2(Tokens): self._logger.debug("TokensV2--get::META> %s" % request.META) self._logger.info("RESP with status> %s" % status.HTTP_200_OK) + # compose the links + v2_version_detail["version"]["links"] = [{ + "href": request.META.get("REQUEST_URI", ""), + "rel": "self" + }] return Response(data=v2_version_detail, status=status.HTTP_200_OK) def post(self, request, vimid=""): diff --git a/share/newton_base/registration/registration.py b/share/newton_base/registration/registration.py index 53893b36..5656c6b6 100644 --- a/share/newton_base/registration/registration.py +++ b/share/newton_base/registration/registration.py @@ -463,7 +463,7 @@ class RegistryHelper(MultiCloudAAIHelper): self._update_resoure( cloud_owner, cloud_region_id, tenant['id'], tenant_info, "tenant") - return (0, "succeed") + return 0, "succeed" except VimDriverNewtonException as e: self._logger.error( "VimDriverNewtonException: status:%s, response:%s" @@ -489,6 +489,8 @@ class RegistryHelper(MultiCloudAAIHelper): cloud_owner, cloud_region_id, tenant['id'], tenant_info, "tenant") + return 0, "succeed" + except Exception as ex: self._logger.error(traceback.format_exc()) return ( diff --git a/share/starlingx_base/resource/infra_workload.py b/share/starlingx_base/resource/infra_workload.py index af5f5531..48990d28 100644 --- a/share/starlingx_base/resource/infra_workload.py +++ b/share/starlingx_base/resource/infra_workload.py @@ -125,7 +125,7 @@ class InfraWorkload(newton_infra_workload.InfraWorkload): else: progress = backlog_item.get( "status", - (13, "DELETE_FAILED", + (13, "UPDATE_FAILED", "Unexpected:status not found in backlog item") ) @@ -136,9 +136,10 @@ class InfraWorkload(newton_infra_workload.InfraWorkload): resp_template["workload_status"] = progress_status resp_template["workload_status_reason"] = progress_msg - status_code = status.HTTP_200_ACCEPTED\ + status_code = status.HTTP_202_ACCEPTED\ if progress_code == 0 else progress_code except Exception as e: + self._logger.warn("Exception: %s" % e.message) resp_template["workload_status_reason"] = progress return Response(data=resp_template, status=status_code) @@ -332,7 +333,7 @@ class InfraWorkload(newton_infra_workload.InfraWorkload): resp_template["workload_status"] = progress_status resp_template["workload_status_reason"] = progress_msg - status_code = status.HTTP_200_ACCEPTED \ + status_code = status.HTTP_202_ACCEPTED \ if progress_code == 0 else progress_code except Exception as e: resp_template["workload_status_reason"] = progress diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile index 36636e5b..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.0-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 406e602e..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.0-SNAPSHOT" -STAGING="1.3.0-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 e94f1004..ee324741 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.0-SNAPSHOT</version> + <version>1.3.3-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 bb3cd641..ec8e00ed 100644 --- a/version.properties +++ b/version.properties @@ -18,7 +18,7 @@ major=1 minor=3 -patch=0 +patch=3 base_version=${major}.${minor}.${patch} diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile index feddcb6e..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.0-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 d880a4ed..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.0-SNAPSHOT" -STAGING="1.3.0-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 1b8e89e6..7cb71170 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.0-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud-openstack-windriver</name> <description>multicloud for openstack Wind River Titanium Cloud</description> |