diff options
author | Bin Yang <bin.yang@windriver.com> | 2017-09-15 12:58:17 +0800 |
---|---|---|
committer | Bin Yang <bin.yang@windriver.com> | 2017-09-15 12:58:17 +0800 |
commit | f646fec97f712cdd5473cc7bf75510f11d68b859 (patch) | |
tree | a1caf9913fe49b4f0d49560e2a059392be0c6bda | |
parent | 311bb07521ee065329021b12ac27b3584826541d (diff) |
Fix build docker jjb issue
Add version.properties file
Change-Id: Id05eb4fdfaef3f4429a589375135e5253a75ea84
Issue-Id: MULTICLOUD-58
Signed-off-by: Bin Yang <bin.yang@windriver.com>
-rw-r--r-- | ocata/vagrant/test/test-extensions.sh | 6 | ||||
-rw-r--r-- | ocata/vagrant/test/tests | 1 | ||||
-rw-r--r-- | version.properties | 24 |
3 files changed, 31 insertions, 0 deletions
diff --git a/ocata/vagrant/test/test-extensions.sh b/ocata/vagrant/test/test-extensions.sh new file mode 100644 index 00000000..084d0f8a --- /dev/null +++ b/ocata/vagrant/test/test-extensions.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne +curl -v -s -H "Content-Type: application/json" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/extensions + +curl -v -s -H "Content-Type: application/json" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/extensions/epa-caps diff --git a/ocata/vagrant/test/tests b/ocata/vagrant/test/tests index 9fb87363..ed71a61d 100644 --- a/ocata/vagrant/test/tests +++ b/ocata/vagrant/test/tests @@ -1 +1,2 @@ test1.sh +test-extensions.sh diff --git a/version.properties b/version.properties new file mode 100644 index 00000000..601b82fd --- /dev/null +++ b/version.properties @@ -0,0 +1,24 @@ +# Copyright (c) 2017 Wind River Systems, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=1 +minor=1 +patch=0 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT |