Remove legacy test alias migration script. (#19629)
* Require code-smell tests to be files. * Add sanity check for integration test aliases. * Remove migration script for test aliases.
This commit is contained in:
Matt Clay
GitHub
parent
241ad8cac3
commit
422857166b
4 changed files with 81 additions and 142 deletions
|
|
@ -632,7 +632,10 @@ def command_sanity_code_smell(args, _):
|
|||
skip_tests = skip_fd.read().splitlines()
|
||||
|
||||
tests = glob.glob('test/sanity/code-smell/*')
|
||||
tests = sorted(p for p in tests if os.access(p, os.X_OK) and os.path.basename(p) not in skip_tests)
|
||||
tests = sorted(p for p in tests
|
||||
if os.access(p, os.X_OK)
|
||||
and os.path.isfile(p)
|
||||
and os.path.basename(p) not in skip_tests)
|
||||
|
||||
for test in tests:
|
||||
display.info('Code smell check using %s' % os.path.basename(test))
|
||||
|
|
|
|||
|
|
@ -1,140 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -eu
|
||||
|
||||
source_root=$(python -c "from os import path; print(path.abspath(path.join(path.dirname('$0'), '..', '..')))")
|
||||
|
||||
cd "${source_root}"
|
||||
|
||||
# Remove existing aliases from previous script runs.
|
||||
rm -f test/integration/targets/*/aliases
|
||||
|
||||
# Map destructive/ targets to integration tests.
|
||||
targets=$(grep 'role:' "test/integration/destructive.yml" \
|
||||
| sed 's/^.* role: //; s/[ ,].*$//;')
|
||||
|
||||
for target in ${targets}; do
|
||||
alias='destructive'
|
||||
echo "target: ${target}, alias: ${alias}"
|
||||
echo "${alias}" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
|
||||
# Map destructive/non_destructive targets to posix groups for integration tests.
|
||||
# This will allow re-balancing of posix tests on Shippable independently of destructive/non_destructive targets.
|
||||
for type in destructive non_destructive; do
|
||||
targets=$(grep 'role:' "test/integration/${type}.yml" \
|
||||
| sed 's/^.* role: //; s/[ ,].*$//;')
|
||||
|
||||
if [ "${type}" = "destructive" ]; then
|
||||
group="posix/ci/group1"
|
||||
else
|
||||
group="posix/ci/group2"
|
||||
fi
|
||||
|
||||
for target in ${targets}; do
|
||||
echo "target: ${target}, group: ${group}"
|
||||
echo "${group}" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
done
|
||||
|
||||
# Add aliases to integration tests.
|
||||
targets=$(grep 'role:' test/integration/{destructive,non_destructive}.yml \
|
||||
| sed 's/^.* role: //; s/[ ,].*$//;')
|
||||
|
||||
for target in ${targets}; do
|
||||
aliases=$(grep -h "role: *${target}[ ,]" test/integration/{destructive,non_destructive}.yml \
|
||||
| sed 's/when:[^,]*//;' \
|
||||
| sed 's/^.*tags:[ []*//g; s/[]}].*$//g; s/ //g; s/,/ /g; s/test_//g;')
|
||||
|
||||
for alias in ${aliases}; do
|
||||
if [ "${target}" != "${alias}" ]; then
|
||||
# convert needs_ prefixed aliases to groups
|
||||
alias="${alias//needs_/needs\/}"
|
||||
|
||||
echo "target: ${target}, alias: ${alias}"
|
||||
echo "${alias}" >> "test/integration/targets/${target}/aliases"
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
# Map test_win_group* targets to windows groups for integration tests.
|
||||
for type in test_win_group1 test_win_group2 test_win_group3; do
|
||||
targets=$(grep 'role:' "test/integration/${type}.yml" \
|
||||
| sed 's/^.* role: //; s/[ ,].*$//;')
|
||||
|
||||
group=$(echo "${type}" | sed 's/^test_win_/windows_/; s/_/\/ci\//;')
|
||||
|
||||
for target in ${targets}; do
|
||||
echo "target: ${target}, group: ${group}"
|
||||
echo "${group}" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
done
|
||||
|
||||
# Add additional windows tests to appropriate groups.
|
||||
echo 'windows/ci/group2' >> test/integration/targets/binary_modules_winrm/aliases
|
||||
echo 'windows/ci/group3' >> test/integration/targets/connection_winrm/aliases
|
||||
|
||||
# Add posix/ci/group3 for posix tests which are not already grouped for ci.
|
||||
group="posix/ci/group3"
|
||||
for target in test/integration/targets/*; do
|
||||
target=$(basename "${target}")
|
||||
if [[ "${target}" =~ (setup|prepare)_ ]]; then
|
||||
continue
|
||||
fi
|
||||
if [ -f "test/integration/targets/${target}/test.sh" ]; then
|
||||
continue
|
||||
fi
|
||||
if [ -f "test/integration/targets/${target}/aliases" ]; then
|
||||
if grep -q -P "^(windows|posix)/" "test/integration/targets/${target}/aliases"; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
if [[ "${target}" =~ _ ]]; then
|
||||
prefix="${target//_*/}"
|
||||
if grep -q --line-regex "${prefix}" test/integration/target-prefixes.*; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
echo "target: ${target}, group: ${group}"
|
||||
echo "${group}" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
|
||||
# Add skip aliases for python3.
|
||||
sed 's/^test_//' test/utils/shippable/python3-test-tag-blacklist.txt | while IFS= read -r target; do
|
||||
echo "skip/python3" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
|
||||
# Add skip aliases for tests which don't pass yet on osx/freebsd.
|
||||
for target in service postgresql mysql_db mysql_user mysql_variables uri get_url async_extra_data; do
|
||||
echo "skip/osx" >> "test/integration/targets/${target}/aliases"
|
||||
echo "skip/freebsd" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
|
||||
# Add skip aliases for tests which don't pass yet on osx.
|
||||
for target in gathering_facts iterators git; do
|
||||
echo "skip/osx" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
|
||||
# Add needs/root entries as required.
|
||||
for target in connection_chroot authorized_key copy template unarchive; do
|
||||
echo "needs/root" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
|
||||
# Add needs/ssh entries as required.
|
||||
for target in async_extra_data connection_ssh connection_paramiko_ssh; do
|
||||
echo "needs/ssh" >> "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
|
||||
# Add missing alias for windows async_status.
|
||||
echo "async_status" >> test/integration/targets/win_async_wrapper/aliases
|
||||
|
||||
# Remove connection tests from CI groups which aren't supported yet.
|
||||
for connection in docker jail libvirt_lxc lxc lxd; do
|
||||
target="connection_${connection}"
|
||||
sed -i '/^posix\/ci\/.*$/d' "test/integration/targets/${target}/aliases"
|
||||
done
|
||||
|
||||
# Sort aliases.
|
||||
for file in test/integration/targets/*/aliases; do
|
||||
sort -o "${file}" "${file}"
|
||||
done
|
||||
77
test/sanity/code-smell/integration-aliases.py
Executable file
77
test/sanity/code-smell/integration-aliases.py
Executable file
|
|
@ -0,0 +1,77 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
import os
|
||||
import textwrap
|
||||
|
||||
|
||||
def main():
|
||||
targets_dir = 'test/integration/targets'
|
||||
|
||||
with open('test/integration/target-prefixes.network', 'r') as prefixes_fd:
|
||||
network_prefixes = prefixes_fd.read().splitlines()
|
||||
|
||||
missing_aliases = []
|
||||
|
||||
for target in sorted(os.listdir(targets_dir)):
|
||||
target_dir = os.path.join(targets_dir, target)
|
||||
aliases_path = os.path.join(target_dir, 'aliases')
|
||||
files = sorted(os.listdir(target_dir))
|
||||
|
||||
# aliases already defined
|
||||
if os.path.exists(aliases_path):
|
||||
continue
|
||||
|
||||
# don't require aliases for support directories
|
||||
if any(os.path.splitext(f)[0] == 'test' for f in files):
|
||||
continue
|
||||
|
||||
# don't require aliases for setup_ directories
|
||||
if target.startswith('setup_'):
|
||||
continue
|
||||
|
||||
# don't require aliases for prepare_ directories
|
||||
if target.startswith('prepare_'):
|
||||
continue
|
||||
|
||||
# TODO: remove this exclusion once the `ansible-test network-integration` command is working properly
|
||||
# don't require aliases for network modules
|
||||
if any(target.startswith('%s_' % prefix) for prefix in network_prefixes):
|
||||
continue
|
||||
|
||||
missing_aliases.append(target_dir)
|
||||
|
||||
if missing_aliases:
|
||||
message = '''
|
||||
The following integration target directories are missing `aliases` files:
|
||||
|
||||
%s
|
||||
|
||||
Unless a test cannot run as part of CI, you'll want to add an appropriate CI alias, such as:
|
||||
|
||||
posix/ci/group1
|
||||
windows/ci/group2
|
||||
|
||||
The CI groups are used to balance tests across multiple jobs to minimize test run time.
|
||||
|
||||
Aliases can also be used to express test requirements:
|
||||
|
||||
needs/privileged
|
||||
needs/root
|
||||
needs/ssh
|
||||
|
||||
Other aliases are used to skip tests under certain conditions:
|
||||
|
||||
skip/freebsd
|
||||
skip/osx
|
||||
skip/python3
|
||||
|
||||
Take a look at existing `aliases` files to see what aliases are available and how they're used.
|
||||
''' % '\n'.join(missing_aliases)
|
||||
|
||||
print(textwrap.dedent(message).strip())
|
||||
|
||||
exit(1)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
@ -22,7 +22,6 @@ pip --version
|
|||
pip list --disable-pip-version-check
|
||||
|
||||
export PATH="test/runner:${PATH}"
|
||||
reorganize-tests.sh # temporary solution until repositories are merged
|
||||
|
||||
# remove empty core/extras module directories from PRs created prior to the repo-merge
|
||||
find lib/ansible/modules -type d -empty -print -delete
|
||||
|
|
|
|||
Loading…
Reference in a new issue