diff --git a/etc/rally.bash_completion b/etc/rally.bash_completion index 3cc70b8f..b84eefb0 100644 --- a/etc/rally.bash_completion +++ b/etc/rally.bash_completion @@ -50,9 +50,9 @@ _rally() OPTS["verify_discover"]="--deployment --pattern" OPTS["verify_genconfig"]="--deployment --tempest-config --override" OPTS["verify_import"]="--deployment --set --file --no-use" - OPTS["verify_install"]="--deployment --source --system-wide" + OPTS["verify_install"]="--deployment --source --version --system-wide" OPTS["verify_list"]="" - OPTS["verify_reinstall"]="--deployment --source --system-wide" + OPTS["verify_reinstall"]="--deployment --source --version --system-wide" OPTS["verify_results"]="--uuid --html --json --output-file" OPTS["verify_show"]="--uuid --sort-by --detailed" OPTS["verify_showconfig"]="--deployment" @@ -87,4 +87,4 @@ _rally() return 0 } -complete -o filenames -F _rally rally +complete -o filenames -F _rally rally \ No newline at end of file diff --git a/tests/ci/rally_verify.py b/tests/ci/rally_verify.py index 2d516084..3aaa05e8 100755 --- a/tests/ci/rally_verify.py +++ b/tests/ci/rally_verify.py @@ -171,8 +171,22 @@ def main(): render_vars = {"verifications": []} - # Verification management stuff + # Install Tempest render_vars["install"] = call_rally("verify install") + + # Get Rally deployment ID + rally_deployment_id = subprocess.check_output( + "rally deployment list | awk '/devstack/ {print $2}'", + shell=True, stderr=subprocess.STDOUT) + # Get the penultimate Tempest commit ID + tempest_commit_id = subprocess.check_output( + "cd /home/jenkins/.rally/tempest/for-deployment-%s " + "git log --skip 1 -n 1 | awk '/commit/ {print $2}' | head -1" + % rally_deployment_id, shell=True, stderr=subprocess.STDOUT).strip() + # Reinstall Tempest with providing the --version arg to the command + render_vars["reinstall"] = call_rally( + "verify reinstall --version %s" % tempest_commit_id) + render_vars["genconfig"] = call_rally("verify genconfig") render_vars["showconfig"] = call_rally("verify showconfig")