Skip to content

Commit

Permalink
Merge pull request #78 from indigo-dc/update-version
Browse files Browse the repository at this point in the history
Update version
  • Loading branch information
Alfonso Pérez authored Jun 12, 2017
2 parents 2a8d447 + abc8de0 commit c2f3a97
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion packaging/debian/build-dev.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
NODE=master
VERSION=1.1
VERSION=1.2
APP=onedock
BASE_FOLDER=.

Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/master/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: onedock-master
Version: 1.1
Version: 1.2
Section: unknown
Priority: extra
Architecture: all
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/node/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: onedock-node
Version: 1.1
Version: 1.2
Section: unknown
Priority: extra
Architecture: all
Expand Down
2 changes: 1 addition & 1 deletion packaging/rpm/build-rpm.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
NODE=master
VERSION=1.1
VERSION=1.2
APP=onedock
BASE_FOLDER=.

Expand Down
2 changes: 1 addition & 1 deletion packaging/rpm/onedock-master.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Summary: ONEDock installation - EXPERIMENTAL. Please consider installing it by hand
Name: onedock-master
Version: 1.1
Version: 1.2
Release: 1
URL: https://github.com/indigo-dc/onedock
License: Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions packaging/rpm/onedock-node.spec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Summary: ONEDock installation - EXPERIMENTAL. Please consider installing it by hand
Name: onedock-node
Version: 1.1
Version: 1.2
Release: 1
URL: https://github.com/indigo-dc/onedock
License: Apache-2.0
Group: unknown
BuildRoot: %{_tmppath}/%{name}-root
Requires: xmlstarlet jq opennebula-node-kvm docker-engine bridge-utils
Requires: xmlstarlet jq opennebula-node-kvm docker-engine bridge-utils
BuildArch: noarch

%description
Expand Down
9 changes: 4 additions & 5 deletions test/010-test-persistence-one4
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,11 @@ oneimage nonpersistent ubuntu

progress

if [[ $FILE_TEST = file ]];
then
echo "Persistence test succeed"
if [[ $FILE_TEST = file ]]; then
echo "Persistence test succeed"
else
echo "Persistence test failed"
exit -1
echo "Persistence test failed"
exit -1
fi


Expand Down
9 changes: 4 additions & 5 deletions test/010-test-persistence-one5
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,11 @@ oneimage nonpersistent ubuntu

progress

if [[ $FILE_TEST = file ]];
then
echo "Persistence test succeed"
if [[ $FILE_TEST = file ]]; then
echo "Persistence test succeed"
else
echo "Persistence test failed"
exit -1
echo "Persistence test failed"
exit -1
fi


Expand Down

0 comments on commit c2f3a97

Please sign in to comment.