Fix DIB_HADOOP_VERSION checks of hadoop-cdh element
We shouldn't begin to build image if specified hadoop version is not supported for CDH Change-Id: I592aec1d3d539231db7b2ca421d58b01cd7101de
This commit is contained in:
parent
deb08683ae
commit
d3e3182517
|
@ -10,10 +10,6 @@ if [ "$distro" != "Ubuntu" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $DIB_HADOOP_VERSION != "2.0.0-mr1-cdh4.5.0" ]; then
|
|
||||||
echo "CDH version $DIB_HADOOP_VERSION not supported. Exiting."
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Hadoop CDH setup begins for $distro"
|
echo "Hadoop CDH setup begins for $distro"
|
||||||
tmp_dir=/tmp/hadoop
|
tmp_dir=/tmp/hadoop
|
||||||
|
|
||||||
|
|
|
@ -10,10 +10,7 @@ if [ -z "$DIB_HADOOP_VERSION" ]; then
|
||||||
echo "DIB_HADOOP_VERSION is not set. Impossible to install hadoop. Exit"
|
echo "DIB_HADOOP_VERSION is not set. Impossible to install hadoop. Exit"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
version_check=$(echo $DIB_HADOOP_VERSION | sed -e '/[0-9]\.[0-9]\.[0-9]/d')
|
if [ $DIB_HADOOP_VERSION != "2.0.0-mr1-cdh4.5.0" ]; then
|
||||||
if [[ -z $version_check ]]; then
|
echo "CDH version $DIB_HADOOP_VERSION not supported. Exiting."
|
||||||
echo "All variables are set, continue."
|
|
||||||
else
|
|
||||||
echo "Version error. Exit"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue