diff --git a/tools/cross_check/cross_check.sh b/tools/cross_check/cross_check.sh index 8fb55d19..6a7cc626 100755 --- a/tools/cross_check/cross_check.sh +++ b/tools/cross_check/cross_check.sh @@ -6,7 +6,8 @@ # * barbican-tempest-plugin # * designate-tempest-plugin # * heat-tempest-plugin -# * manila tempest-plugin +# * manila-tempest-plugin +# * octavia-tempest-plugin # except those that: # * are/were part of interop repository or # * are mentioned in exclude file (see option --exclude-file) or @@ -34,6 +35,8 @@ function print_help() { echo "--heat-commit ID of heat-tempest-plugin commit that should be used" echo "--manila-url URL to download manila-tempest-plugin" echo "--manila-commit ID of manila-tempest-plugin commit that should be used" + echo "--octavia-url URL to download octavia-tempest-plugin" + echo "--octavia-commit ID of octavia-tempest-plugin commit that should be used" echo "--exclude-file File that contains tests that should be ignored" echo " (Default: ./exclude_file.txt)" } @@ -53,6 +56,9 @@ HEAT_COMMIT=master MANILA_GIT_URL=https://opendev.org/openstack/manila-tempest-plugin.git MANILA_COMMIT=master +OCTAVIA_GIT_URL=https://opendev.org/openstack/octavia-tempest-plugin.git +OCTAVIA_COMMIT=master + INTEROP_GIT_URL=https://opendev.org/openinfra/interop.git INTEROP_COMMIT=master @@ -98,6 +104,12 @@ while [[ ! -z "$1" ]]; do --manila-commit) MANILA_COMMIT="$2" shift 2;; + --octavia-url) + OCTAVIA_URL="$2"; + shift 2;; + --octavia-commit) + OCTAVIA_COMMIT="$2" + shift 2;; --exclude-file) EXCLUDE_FILE="$2"; shift 2;; @@ -159,6 +171,12 @@ cd ${TMP_DIR}/manila-tempest-plugin git checkout --quiet ${MANILA_COMMIT} cd - &> /dev/null +echo "Cloning octavia-tempest-plugin repository ..." +git clone --quiet ${OCTAVIA_GIT_URL} ${TMP_DIR}/octavia-tempest-plugin +cd ${TMP_DIR}/octavia-tempest-plugin +git checkout --quiet ${OCTAVIA_COMMIT} +cd - &> /dev/null + ######################################################## # Find and print missing tests from interop repository. # @@ -254,6 +272,9 @@ cross_check ${TMP_DIR}/heat-tempest-plugin > ${TMP_DIR}/heat_tests.txt echo "Searching manila-tempest-plugin repository ..." cross_check ${TMP_DIR}/manila-tempest-plugin > ${TMP_DIR}/manila_tests.txt +echo "Searching octavia-tempest-plugin repository ..." +cross_check ${TMP_DIR}/octavia-tempest-plugin > ${TMP_DIR}/octavia_tests.txt + echo "Tempest tests:" echo "--------------" sort ${TMP_DIR}/tempest_tests.txt @@ -277,6 +298,12 @@ echo "" echo "Manila-tempest-plugin tests:" echo "----------------------------" sort ${TMP_DIR}/manila_tests.txt +echo "" + +echo "octavia-tempest-plugin tests:" +echo "--------------------------" +sort ${TMP_DIR}/octavia_tests.txt +echo "" # Cleanup rm -rf ${TMP_DIR}