diff --git a/qa/vagrant/pom.xml b/qa/vagrant/pom.xml index 647a5c8de1f..b1ed9a3959a 100644 --- a/qa/vagrant/pom.xml +++ b/qa/vagrant/pom.xml @@ -35,6 +35,9 @@ /usr/bin/rpmbuild + 2.0.0-beta1 diff --git a/qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash b/qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash index dd993debcfb..ff7255c5417 100644 --- a/qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash +++ b/qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash @@ -232,7 +232,9 @@ verify_package_installation() { fi } -# Install the rpm or deb package +# Install the rpm or deb package. +# -u upgrade rather than install. This only matters for rpm. +# -v the version to upgrade to. Defaults to the version under test. install_package() { local version=$(cat version) local rpmCommand='-i' @@ -332,6 +334,8 @@ clean_before_test() { done } +# Start elasticsearch and wait for it to come up with a status. +# $1 - expected status - defaults to green start_elasticsearch_service() { local desiredStatus=${1:-green} @@ -404,7 +408,8 @@ stop_elasticsearch_service() { fi } -# Waits for Elasticsearch to reach a given status (defaults to "green") +# Waits for Elasticsearch to reach some status. +# $1 - expected status - defaults to green wait_for_elasticsearch_status() { local desiredStatus=${1:-green}