HDDS-1628. Fix the execution and return code of smoketest executor shell script
Closes #902
This commit is contained in:
parent
433e97cd34
commit
42cd861be0
@ -13,6 +13,7 @@
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
export HADOOP_VERSION=3
|
||||
hadoop-ozone/dist/target/ozone-*-SNAPSHOT/smoketest/test.sh
|
||||
"$DIR/../../../hadoop-ozone/dist/target/ozone-*-SNAPSHOT/compose/test-all.sh"
|
||||
exit $?
|
||||
|
@ -34,7 +34,7 @@ for test in $(find $SCRIPT_DIR -name test.sh); do
|
||||
|
||||
#required to read the .env file from the right location
|
||||
cd "$(dirname "$test")" || continue
|
||||
$test
|
||||
./test.sh
|
||||
ret=$?
|
||||
if [[ $ret -ne 0 ]]; then
|
||||
RESULT=-1
|
||||
|
3
hadoop-ozone/dist/src/main/smoketest/test.sh
vendored
3
hadoop-ozone/dist/src/main/smoketest/test.sh
vendored
@ -23,5 +23,6 @@ REPLACEMENT="$DIR/../compose/test-all.sh"
|
||||
echo "THIS SCRIPT IS DEPRECATED. Please use $REPLACEMENT instead."
|
||||
|
||||
${REPLACEMENT}
|
||||
|
||||
RESULT=$?
|
||||
cp -r "$DIR/../compose/result" "$DIR"
|
||||
exit $RESULT
|
||||
|
Loading…
Reference in New Issue
Block a user