Revert "Add debug logging for Vagrant upgrade test"
This reverts commit 7ecfa6e2ad
.
This commit is contained in:
parent
a0634b2442
commit
85b06f48cf
|
@ -42,7 +42,6 @@ setup() {
|
||||||
@test "[UPGRADE] install old version" {
|
@test "[UPGRADE] install old version" {
|
||||||
clean_before_test
|
clean_before_test
|
||||||
install_package -v $(cat upgrade_from_version)
|
install_package -v $(cat upgrade_from_version)
|
||||||
perl -p -i -e 's/es.logger.level: INFO/es.logger.level: DEBUG/' /etc/elasticsearch/logging.yml
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "[UPGRADE] start old version" {
|
@test "[UPGRADE] start old version" {
|
||||||
|
@ -81,7 +80,6 @@ setup() {
|
||||||
|
|
||||||
@test "[UPGRADE] install version under test" {
|
@test "[UPGRADE] install version under test" {
|
||||||
install_package -u
|
install_package -u
|
||||||
perl -p -i -e 's/es.logger.level: INFO/es.logger.level: DEBUG/' /etc/elasticsearch/logging.yml
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "[UPGRADE] start version under test" {
|
@test "[UPGRADE] start version under test" {
|
||||||
|
|
|
@ -400,10 +400,6 @@ wait_for_elasticsearch_status() {
|
||||||
local desiredStatus=${1:-green}
|
local desiredStatus=${1:-green}
|
||||||
local index=$2
|
local index=$2
|
||||||
|
|
||||||
if [ -f /var/log/elasitcsearch/elasticsearch.log ]; then
|
|
||||||
cat /var/log/elasticsearch/elasticsearch.log >&3
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Making sure elasticsearch is up..."
|
echo "Making sure elasticsearch is up..."
|
||||||
wget -O - --retry-connrefused --waitretry=1 --timeout=60 --tries 60 http://localhost:9200/_cluster/health || {
|
wget -O - --retry-connrefused --waitretry=1 --timeout=60 --tries 60 http://localhost:9200/_cluster/health || {
|
||||||
echo "Looks like elasticsearch never started. Here is its log:"
|
echo "Looks like elasticsearch never started. Here is its log:"
|
||||||
|
@ -413,7 +409,6 @@ wait_for_elasticsearch_status() {
|
||||||
echo "The elasticsearch log doesn't exist. Maybe /var/log/messages has something:"
|
echo "The elasticsearch log doesn't exist. Maybe /var/log/messages has something:"
|
||||||
tail -n20 /var/log/messages
|
tail -n20 /var/log/messages
|
||||||
fi
|
fi
|
||||||
cat /var/log/elasticsearch/elasticsearch.log >&3
|
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -428,7 +423,6 @@ wait_for_elasticsearch_status() {
|
||||||
echo "Connected"
|
echo "Connected"
|
||||||
else
|
else
|
||||||
echo "Unable to connect to Elastisearch"
|
echo "Unable to connect to Elastisearch"
|
||||||
cat /var/log/elasticsearch/elasticsearch.log >&3
|
|
||||||
false
|
false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue