mirror of https://github.com/ansible/ansible.git
Fix differences with devel.
parent
1c9a58a885
commit
c709b22e5c
@ -1,7 +0,0 @@
|
|||||||
#!/bin/bash -eux
|
|
||||||
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
source_root=$(python -c "from os import path; print(path.abspath(path.join(path.dirname('$0'), '../../..')))")
|
|
||||||
|
|
||||||
"${source_root}/test/utils/shippable/${TEST}.sh" 2>&1 | gawk '{ print strftime("%Y-%m-%d %H:%M:%S"), $0; fflush(); }'
|
|
@ -1,2 +0,0 @@
|
|||||||
jinja2
|
|
||||||
pyyaml
|
|
@ -1,62 +0,0 @@
|
|||||||
#!/bin/bash -eux
|
|
||||||
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
ansible_repo_url="https://github.com/ansible/ansible.git"
|
|
||||||
|
|
||||||
build_dir="${SHIPPABLE_BUILD_DIR}"
|
|
||||||
repo="${REPO_NAME}"
|
|
||||||
|
|
||||||
case "${repo}" in
|
|
||||||
"ansible-modules-core")
|
|
||||||
this_module_group="core"
|
|
||||||
other_module_group="extras"
|
|
||||||
;;
|
|
||||||
"ansible-modules-extras")
|
|
||||||
this_module_group="extras"
|
|
||||||
other_module_group="core"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unsupported repo name: ${repo}"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
modules_tmp_dir="${build_dir}.tmp"
|
|
||||||
this_modules_dir="${build_dir}/lib/ansible/modules/${this_module_group}"
|
|
||||||
other_modules_dir="${build_dir}/lib/ansible/modules/${other_module_group}"
|
|
||||||
|
|
||||||
cd /
|
|
||||||
mv "${build_dir}" "${modules_tmp_dir}"
|
|
||||||
git clone "${ansible_repo_url}" "${build_dir}"
|
|
||||||
cd "${build_dir}"
|
|
||||||
rmdir "${this_modules_dir}"
|
|
||||||
mv "${modules_tmp_dir}" "${this_modules_dir}"
|
|
||||||
mv "${this_modules_dir}/shippable" "${build_dir}"
|
|
||||||
git submodule init "${other_modules_dir}"
|
|
||||||
git submodule sync "${other_modules_dir}"
|
|
||||||
git submodule update "${other_modules_dir}"
|
|
||||||
|
|
||||||
pip install -r lib/ansible/modules/${this_module_group}/test/utils/shippable/docs-requirements.txt --upgrade
|
|
||||||
pip list
|
|
||||||
|
|
||||||
source hacking/env-setup
|
|
||||||
|
|
||||||
docs_status=0
|
|
||||||
|
|
||||||
PAGER=/bin/cat \
|
|
||||||
ANSIBLE_DEPRECATION_WARNINGS=false \
|
|
||||||
bin/ansible-doc -l \
|
|
||||||
2>/tmp/ansible-doc.err || docs_status=$?
|
|
||||||
|
|
||||||
if [ -s /tmp/ansible-doc.err ]; then
|
|
||||||
# report warnings as errors
|
|
||||||
echo "Output from 'ansible-doc -l' on stderr is considered an error:"
|
|
||||||
cat /tmp/ansible-doc.err
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${docs_status}" -ne 0 ]; then
|
|
||||||
echo "Running 'ansible-doc -l' failed with no output on stderr and exit code: ${docs_status}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
@ -1,55 +0,0 @@
|
|||||||
#!/bin/bash -eux
|
|
||||||
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
ansible_repo_url="https://github.com/ansible/ansible.git"
|
|
||||||
|
|
||||||
is_pr="${IS_PULL_REQUEST}"
|
|
||||||
build_dir="${SHIPPABLE_BUILD_DIR}"
|
|
||||||
repo="${REPO_NAME}"
|
|
||||||
|
|
||||||
if [ "${is_pr}" != "true" ]; then
|
|
||||||
echo "Module integration tests are only supported on pull requests."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "${repo}" in
|
|
||||||
"ansible-modules-core")
|
|
||||||
this_module_group="core"
|
|
||||||
other_module_group="extras"
|
|
||||||
;;
|
|
||||||
"ansible-modules-extras")
|
|
||||||
this_module_group="extras"
|
|
||||||
other_module_group="core"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unsupported repo name: ${repo}"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
modules_tmp_dir="${build_dir}.tmp"
|
|
||||||
this_modules_dir="${build_dir}/lib/ansible/modules/${this_module_group}"
|
|
||||||
other_modules_dir="${build_dir}/lib/ansible/modules/${other_module_group}"
|
|
||||||
|
|
||||||
cd /
|
|
||||||
mv "${build_dir}" "${modules_tmp_dir}"
|
|
||||||
git clone "${ansible_repo_url}" "${build_dir}"
|
|
||||||
cd "${build_dir}"
|
|
||||||
rmdir "${this_modules_dir}"
|
|
||||||
mv "${modules_tmp_dir}" "${this_modules_dir}"
|
|
||||||
mv "${this_modules_dir}/shippable" "${build_dir}"
|
|
||||||
git submodule init "${other_modules_dir}"
|
|
||||||
git submodule sync "${other_modules_dir}"
|
|
||||||
git submodule update "${other_modules_dir}"
|
|
||||||
|
|
||||||
pip install -r test/utils/shippable/modules/generate-tests-requirements.txt --upgrade
|
|
||||||
pip list
|
|
||||||
|
|
||||||
source hacking/env-setup
|
|
||||||
|
|
||||||
test/utils/shippable/modules/generate-tests "${this_module_group}" --verbose --output /tmp/integration.sh >/dev/null
|
|
||||||
|
|
||||||
if [ -f /tmp/integration.sh ]; then
|
|
||||||
/bin/bash -eux /tmp/integration.sh
|
|
||||||
fi
|
|
@ -1 +0,0 @@
|
|||||||
/cloud/[^/]+/(?!(ec2_facts.py|_ec2_ami_search.py))
|
|
@ -1,41 +0,0 @@
|
|||||||
#!/bin/bash -eux
|
|
||||||
|
|
||||||
source_root=$(python -c "from os import path; print(path.abspath(path.join(path.dirname('$0'), '../../..')))")
|
|
||||||
|
|
||||||
install_deps="${INSTALL_DEPS:-}"
|
|
||||||
|
|
||||||
cd "${source_root}"
|
|
||||||
|
|
||||||
# FIXME REPOMERGE: No need to checkout ansible
|
|
||||||
build_dir=$(mktemp -d)
|
|
||||||
trap 'rm -rf "${build_dir}"' EXIT
|
|
||||||
|
|
||||||
git clone "https://github.com/ansible/ansible.git" "${build_dir}" --recursive
|
|
||||||
source "${build_dir}/hacking/env-setup"
|
|
||||||
# REPOMERGE: END
|
|
||||||
|
|
||||||
if [ "${install_deps}" != "" ]; then
|
|
||||||
add-apt-repository ppa:fkrull/deadsnakes
|
|
||||||
apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports universe'
|
|
||||||
apt-get update -qq
|
|
||||||
|
|
||||||
apt-get install -qq shellcheck python2.4
|
|
||||||
|
|
||||||
# Install dependencies for ansible and validate_modules
|
|
||||||
pip install -r "${build_dir}/test/utils/shippable/sanity-requirements.txt" --upgrade
|
|
||||||
pip list
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
validate_modules="${build_dir}/test/sanity/validate-modules/validate-modules"
|
|
||||||
|
|
||||||
python2.4 -m compileall -fq -x "($(printf %s "$(< "test/utils/shippable/sanity-skip-python24.txt"))" | tr '\n' '|')" .
|
|
||||||
python2.6 -m compileall -fq .
|
|
||||||
python2.7 -m compileall -fq .
|
|
||||||
python3.5 -m compileall -fq .
|
|
||||||
|
|
||||||
ANSIBLE_DEPRECATION_WARNINGS=false \
|
|
||||||
"${validate_modules}" --exclude '/utilities/|/shippable(/|$)' .
|
|
||||||
|
|
||||||
shellcheck \
|
|
||||||
test/utils/shippable/*.sh
|
|
Loading…
Reference in New Issue