summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fcaps/docker/build_image.sh4
-rw-r--r--fcaps/pom.xml4
-rwxr-xr-xpike/docker/build_image.sh4
-rw-r--r--pike/pike/proxy/urls.py2
-rw-r--r--pike/pike/proxy/urls_v1.py2
-rw-r--r--pike/pom.xml4
-rw-r--r--pom.xml2
-rw-r--r--releases/container-1.4.2.yaml14
-rw-r--r--releases/maven-1.4.2.yaml4
-rwxr-xr-xstarlingx/docker/build_image.sh4
-rw-r--r--starlingx/pom.xml4
-rw-r--r--starlingx/starlingx/proxy/urls.py2
-rw-r--r--starlingx/starlingx/proxy/urlsV1.py2
-rw-r--r--version.properties4
-rw-r--r--windriver/docker/build_image.sh4
-rw-r--r--windriver/pom.xml4
-rw-r--r--windriver/titanium_cloud/proxy/urls.py2
-rw-r--r--windriver/titanium_cloud/proxy/urlsV1.py2
18 files changed, 43 insertions, 25 deletions
diff --git a/fcaps/docker/build_image.sh b/fcaps/docker/build_image.sh
index 44f29912..459126fe 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.4.1-SNAPSHOT"
-STAGING="1.4.1-STAGING"
+VERSION="1.5.0-SNAPSHOT"
+STAGING="1.5.0-STAGING"
PROJECT="multicloud"
IMAGE="openstack-fcaps"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/fcaps/pom.xml b/fcaps/pom.xml
index d210df6e..bc49e1cf 100644
--- a/fcaps/pom.xml
+++ b/fcaps/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-root</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-fcaps</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-fcaps</name>
<description>multicloud for openstack Wind River Titanium Cloud</description>
diff --git a/pike/docker/build_image.sh b/pike/docker/build_image.sh
index fcfea6b7..5e520e2b 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.4.1-SNAPSHOT"
-STAGING="1.4.1-STAGING"
+VERSION="1.5.0-SNAPSHOT"
+STAGING="1.5.0-STAGING"
OS_VERSION="pike"
IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
diff --git a/pike/pike/proxy/urls.py b/pike/pike/proxy/urls.py
index b92b5354..a1020215 100644
--- a/pike/pike/proxy/urls.py
+++ b/pike/pike/proxy/urls.py
@@ -32,7 +32,7 @@ URLPATTERNS = [
services.GetTenants.as_view()),
url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
dnsaasdelegate.DnsaasDelegate.as_view()),
- url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+ url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.Services.as_view()),
]
diff --git a/pike/pike/proxy/urls_v1.py b/pike/pike/proxy/urls_v1.py
index 4ab75947..8d2fa66e 100644
--- a/pike/pike/proxy/urls_v1.py
+++ b/pike/pike/proxy/urls_v1.py
@@ -32,7 +32,7 @@ URLPATTERNS = [
services.APIv1GetTenants.as_view()),
url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
dnsaasdelegate.APIv1DnsaasDelegate.as_view()),
- url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+ url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.APIv1Services.as_view()),
]
diff --git a/pike/pom.xml b/pike/pom.xml
index 831e8c22..f682f002 100644
--- a/pike/pom.xml
+++ b/pike/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-root</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-pike</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.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 a2055d53..2f2927a0 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.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>multicloud-openstack</name>
<packaging>pom</packaging>
<description>multicloud openstack</description>
diff --git a/releases/container-1.4.2.yaml b/releases/container-1.4.2.yaml
new file mode 100644
index 00000000..c7754c2f
--- /dev/null
+++ b/releases/container-1.4.2.yaml
@@ -0,0 +1,14 @@
+distribution_type: 'container'
+container_release_tag: '1.4.2'
+project: 'multicloud-openstack'
+log_dir: 'multicloud-openstack-maven-docker-stage-master/120/'
+ref: a1825ada72191444dd750f18e90df52351f9ea9f
+containers:
+ - name: 'multicloud/openstack-fcaps'
+ version: '1.4.2'
+ - name: 'multicloud/openstack-pike'
+ version: '1.4.2'
+ - name: 'multicloud/openstack-starlingx'
+ version: '1.4.2'
+ - name: 'multicloud/openstack-windriver'
+ version: '1.4.2'
diff --git a/releases/maven-1.4.2.yaml b/releases/maven-1.4.2.yaml
new file mode 100644
index 00000000..0e791ce7
--- /dev/null
+++ b/releases/maven-1.4.2.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '1.4.2'
+project: 'multicloud-openstack'
+log_dir: 'multicloud-openstack-maven-stage-master/190/'
diff --git a/starlingx/docker/build_image.sh b/starlingx/docker/build_image.sh
index 001f9701..a4f4b51f 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.4.1-SNAPSHOT"
-STAGING="1.4.1-STAGING"
+VERSION="1.5.0-SNAPSHOT"
+STAGING="1.5.0-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 f018ea1c..3ea35665 100644
--- a/starlingx/pom.xml
+++ b/starlingx/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-root</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-starlingx</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-starlingx</name>
<description>multicloud for openstack starlingx</description>
diff --git a/starlingx/starlingx/proxy/urls.py b/starlingx/starlingx/proxy/urls.py
index cde9e2b2..453bf521 100644
--- a/starlingx/starlingx/proxy/urls.py
+++ b/starlingx/starlingx/proxy/urls.py
@@ -34,7 +34,7 @@ URLPATTERNS = [
services.GetTenants.as_view()),
url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
dnsaasdelegate.DnsaasDelegate.as_view()),
- url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+ url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.Services.as_view()),
]
diff --git a/starlingx/starlingx/proxy/urlsV1.py b/starlingx/starlingx/proxy/urlsV1.py
index 7fca18e1..d774b483 100644
--- a/starlingx/starlingx/proxy/urlsV1.py
+++ b/starlingx/starlingx/proxy/urlsV1.py
@@ -32,7 +32,7 @@ URLPATTERNS = [
services.APIv1GetTenants.as_view()),
url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
dnsaasdelegate.APIv1DnsaasDelegate.as_view()),
- url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+ url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.APIv1Services.as_view()),
]
diff --git a/version.properties b/version.properties
index cfb79316..79e68663 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=4
-patch=1
+minor=5
+patch=0
base_version=${major}.${minor}.${patch}
diff --git a/windriver/docker/build_image.sh b/windriver/docker/build_image.sh
index 61bf8050..3151baeb 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.4.1-SNAPSHOT"
-STAGING="1.4.1-STAGING"
+VERSION="1.5.0-SNAPSHOT"
+STAGING="1.5.0-STAGING"
PROJECT="multicloud"
IMAGE="openstack-windriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 6ae6c73c..65591f81 100644
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-root</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-windriver</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-windriver</name>
<description>multicloud for openstack Wind River Titanium Cloud</description>
diff --git a/windriver/titanium_cloud/proxy/urls.py b/windriver/titanium_cloud/proxy/urls.py
index 7b33801d..dd5d4f1c 100644
--- a/windriver/titanium_cloud/proxy/urls.py
+++ b/windriver/titanium_cloud/proxy/urls.py
@@ -34,7 +34,7 @@ URLPATTERNS = [
services.GetTenants.as_view()),
url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
dnsaasdelegate.DnsaasDelegate.as_view()),
- url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+ url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.Services.as_view()),
]
diff --git a/windriver/titanium_cloud/proxy/urlsV1.py b/windriver/titanium_cloud/proxy/urlsV1.py
index 88a8638a..c3599b57 100644
--- a/windriver/titanium_cloud/proxy/urlsV1.py
+++ b/windriver/titanium_cloud/proxy/urlsV1.py
@@ -32,7 +32,7 @@ URLPATTERNS = [
services.APIv1GetTenants.as_view()),
url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
dnsaasdelegate.APIv1DnsaasDelegate.as_view()),
- url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+ url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.APIv1Services.as_view()),
]