Skip to content

Commit 62a07ed

Browse files
committed
removed unused docker execs
1 parent da6fe7a commit 62a07ed

File tree

3 files changed

+0
-25
lines changed

3 files changed

+0
-25
lines changed

tests/test_hadoop.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,13 @@ export HADOOP_YARN_RESOURCE_MANAGER_PORT_DEFAULT="8088"
4242
export HADOOP_YARN_NODE_MANAGER_PORT_DEFAULT="8042"
4343
#export HADOOP_PORTS="8042 8088 50010 50020 50070 50075 50090"
4444

45-
# not used any more, see instead tests/docker/hadoop-docker-compose.yml
46-
#export DOCKER_IMAGE="harisekhon/hadoop"
47-
#export MNTDIR="/py"
48-
4945
# NN comes up, but RM is really slow to come up, give 80 secs not 50
5046
startupwait 80
5147

5248
check_docker_available
5349

5450
trap_debug_env hadoop
5551

56-
docker_exec(){
57-
#docker-compose exec "$DOCKER_SERVICE" $MNTDIR/$@
58-
echo "docker exec '$DOCKER_CONTAINER' $MNTDIR/$@"
59-
docker exec "$DOCKER_CONTAINER" $MNTDIR/$@
60-
}
61-
6252
test_hadoop(){
6353
local version="$1"
6454
section2 "Setting up Hadoop $version test container"

tests/test_opentsdb.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ export OPENTSDB_VERSIONS="${@:-latest}"
4747
#export DOCKER_IMAGE="petergrace/opentsdb-docker"
4848
export DOCKER_CONTAINER="opentsdb-test"
4949

50-
export MNTDIR=/pytools
51-
5250
export DATA_FILE='tests/data/opentsdb_data.txt'
5351

5452
#if ! is_docker_available; then
@@ -58,13 +56,6 @@ export DATA_FILE='tests/data/opentsdb_data.txt'
5856

5957
startupwait 50
6058

61-
docker_exec(){
62-
docker exec -i "$DOCKER_CONTAINER" /bin/bash <<-EOF
63-
export JAVA_HOME=/usr
64-
$MNTDIR/$@
65-
EOF
66-
}
67-
6859
generate_test_data(){
6960
if [ -f "$DATA_FILE" ]; then
7061
echo "data file '$DATA_FILE' already exists, not regenerating"

tests/test_solrcloud.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,13 @@ export SOLR_PORTS="$SOLR_PORT_DEFAULT 8984 $SOLR_ZOOKEEPER_PORT_DEFAULT"
3636
export ZOOKEEPER_HOST="$SOLR_HOST"
3737

3838
export SOLR_HOME="/solr"
39-
export MNTDIR="/pl"
4039

4140
startupwait 30
4241

4342
check_docker_available
4443

4544
trap_debug_env solr zookeeper
4645

47-
docker_exec(){
48-
echo "docker-compose exec '$DOCKER_SERVICE' $MNTDIR/$@"
49-
docker-compose exec "$DOCKER_SERVICE" $MNTDIR/$@
50-
}
51-
5246
test_solrcloud(){
5347
local version="$1"
5448
# SolrCloud 4.x needs some different args / locations

0 commit comments

Comments
 (0)