diff --git a/tools/cross_check/cross_check.sh b/tools/cross_check/cross_check.sh index 451fc9d4..8fb55d19 100755 --- a/tools/cross_check/cross_check.sh +++ b/tools/cross_check/cross_check.sh @@ -1,9 +1,13 @@ #!/bin/bash # This script is useful when it is time to find # new candidate tests for refstack. It lists -# all API tests from tempest, designate-tempest-plugin, -# heat-tempest-plugin and manila tempest-plugin except -# those that: +# all API tests from: +# * tempest +# * barbican-tempest-plugin +# * designate-tempest-plugin +# * heat-tempest-plugin +# * manila tempest-plugin +# except those that: # * are/were part of interop repository or # * are mentioned in exclude file (see option --exclude-file) or # * are scenario tests or @@ -22,6 +26,8 @@ function print_help() { echo "--interop-commit ID of interop commit that should be used" echo "--tempest-url URL to download tempest git repository" echo "--tempest-commit ID of tempest commit that should be used" + echo "--barbican-url URL to download barbican-tempest-plugin git repository" + echo "--barbican-commit ID of barbican-tempest-plugin commit that should be used" echo "--designate-url URL to download designate-tempest-plugin git repository" echo "--designate-commit ID of designate-tempest-plugin commit that should be used" echo "--heat-url URL to download heat-tempest-plugin" @@ -35,6 +41,9 @@ function print_help() { TEMPEST_GIT_URL=https://opendev.org/openstack/tempest.git TEMPEST_COMMIT=1d500e79156ada6bc6fdb628ed1da0efd4121f6a +BARBICAN_GIT_URL=https://opendev.org/openstack/barbican-tempest-plugin.git +BARBICAN_COMMIT=master + DESIGNATE_GIT_URL=https://opendev.org/openstack/designate-tempest-plugin.git DESIGNATE_COMMIT=master @@ -65,6 +74,12 @@ while [[ ! -z "$1" ]]; do --tempest-commit) TEMPEST_COMMIT="$2"; shift 2;; + --barbican-url) + BARBICAN_GIT_URL="$2"; + shift 2;; + --barbican-commit) + BARBICAN_COMMIT="$2"; + shift 2;; --designate-url) DESIGNATE_GIT_URL="$2"; shift 2;; @@ -120,6 +135,12 @@ cd ${TMP_DIR}/tempest git checkout --quiet ${TEMPEST_COMMIT} cd - &> /dev/null +echo "Cloning barbican-tempest-plugin repository ..." +git clone --quiet ${BARBICAN_GIT_URL} ${TMP_DIR}/barbican-tempest-plugin +cd ${TMP_DIR}/barbican-tempest-plugin +git checkout --quiet ${BARBICAN_COMMIT} +cd - &> /dev/null + echo "Cloning designate-tempest-plugin repository ..." git clone --quiet ${DESIGNATE_GIT_URL} ${TMP_DIR}/designate-tempest-plugin cd ${TMP_DIR}/designate-tempest-plugin @@ -221,6 +242,9 @@ function cross_check() { echo "Searching tempest repository ..." cross_check ${TMP_DIR}/tempest > ${TMP_DIR}/tempest_tests.txt +echo "Searching barbican-tempest-plugin repository ..." +cross_check ${TMP_DIR}/barbican-tempest-plugin > ${TMP_DIR}/barbican_tests.txt + echo "Searching designate-tempest-plugin repository ..." cross_check ${TMP_DIR}/designate-tempest-plugin > ${TMP_DIR}/designate_tests.txt @@ -235,6 +259,11 @@ echo "--------------" sort ${TMP_DIR}/tempest_tests.txt echo "" +echo "Barbican-tempest-plugin tests:" +echo "-------------------------------" +sort ${TMP_DIR}/barbican_tests.txt +echo "" + echo "Designate-tempest-plugin tests:" echo "-------------------------------" sort ${TMP_DIR}/designate_tests.txt @@ -251,4 +280,3 @@ sort ${TMP_DIR}/manila_tests.txt # Cleanup rm -rf ${TMP_DIR} -