Revert "Move requirements into tests. (#35197)"

This reverts commit 4f6017dc16.
This commit is contained in:
Matt Clay 2018-01-23 10:54:25 -08:00
parent eae23d2dbd
commit 69132007c0
13 changed files with 26 additions and 54 deletions

View file

@ -100,6 +100,10 @@
shell: which bash
register: bash
- name: locate sha1sum/shasum
shell: which sha1sum || which shasum
register: sha1sum
##
## command
##
@ -192,7 +196,7 @@
- "command_result5.stdout == 'foobar'"
- name: send to stdin literal multiline block
command: "{{ ansible_python_interpreter }} -c 'import hashlib, sys; print(hashlib.sha1((sys.stdin.buffer if hasattr(sys.stdin, \"buffer\") else sys.stdin).read()).hexdigest())'"
command: "{{ sha1sum.stdout }}"
args:
stdin: |-
this is the first line
@ -205,7 +209,7 @@
- name: assert the multiline input was passed correctly
assert:
that:
- "command_result6.stdout == '9cd0697c6a9ff6689f0afb9136fa62e0b3fee903'"
- "command_result6.stdout == '9cd0697c6a9ff6689f0afb9136fa62e0b3fee903 -'"
##
## shell
@ -274,7 +278,9 @@
"multiline echo" \
"with a new line
in quotes" \
| {{ ansible_python_interpreter }} -c 'import hashlib, sys; print(hashlib.sha1((sys.stdin.buffer if hasattr(sys.stdin, "buffer") else sys.stdin).read()).hexdigest())'
| {{ sha1sum.stdout }} \
| tr -s ' ' \
| cut -f1 -d ' '
echo "this is a second line"
register: shell_result5

View file

@ -9,6 +9,10 @@
set_fact:
remote_file: "{{ remote_dir }}/foo.txt"
- name: Locate sha1sum/shasum
shell: which sha1sum || which shasum
register: sha1sum
- name: Initiate a basic copy, and also test the mode
copy:
src: foo.txt
@ -1123,7 +1127,7 @@
- stat_link_result.stat.islnk
- name: Get the checksum of the link target
shell: "{{ ansible_python_interpreter }} -c 'import hashlib; print(hashlib.sha1(open(\"{{remote_dir | expanduser}}/follow_test\", \"rb\").read()).hexdigest())'"
shell: "{{ sha1sum.stdout }} {{remote_dir}}/follow_test | cut -f1 -sd ' '"
register: target_file_result
- name: Assert that the link target was updated

View file

@ -16,22 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
- include_vars: '{{ item }}'
with_first_found:
- files:
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
- '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
- '{{ ansible_os_family }}.yml'
- 'default.yml'
paths: '../vars'
- name: install dependencies for test
package: name={{ package_item }} state=present
with_items: "{{ test_packages }}"
loop_control:
loop_var: package_item
when: ansible_distribution != "MacOSX"
- name: remove a gem
gem: name=gist state=absent

View file

@ -1,3 +0,0 @@
test_packages:
- "devel/ruby-gems"
- "ruby"

View file

@ -1,2 +0,0 @@
test_packages:
- "rubygems"

View file

@ -1 +0,0 @@
test_packages: []

View file

@ -8,11 +8,6 @@
path: "{{ output_dir }}"
state: directory
- name: SETUP | install git
package:
name: git
when: ansible_distribution != "MacOSX"
- name: SETUP | verify that git is installed so this test can continue
shell: which git

View file

@ -25,11 +25,6 @@
- name: clean out the output_dir
shell: rm -rf {{ output_dir }}/*
- name: install mercurial
package:
name: mercurial
when: ansible_distribution != "MacOSX"
- name: verify that mercurial is installed so this test can continue
shell: which hg

View file

@ -11,8 +11,6 @@ repo_dir="${temp_dir}/repo"
pull_dir="${temp_dir}/pull"
temp_log="${temp_dir}/pull.log"
ansible-playbook setup.yml
cp -av "pull-integration-test" "${repo_dir}"
cd "${repo_dir}"
(

View file

@ -1,6 +0,0 @@
- hosts: localhost
tasks:
- name: install git
package:
name: git
when: ansible_distribution != "MacOSX"

View file

@ -25,11 +25,6 @@
- name: clean out the output_dir
shell: rm -rf {{ output_dir }}/*
- name: install subversion
package:
name: subversion
when: ansible_distribution != "MacOSX"
- name: verify that subversion is installed so this test can continue
shell: which svn

View file

@ -16,11 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
- name: install rsync
package:
name: rsync
when: ansible_distribution != "MacOSX"
- name: cleanup old files
shell: rm -rf {{output_dir}}/*

View file

@ -14,9 +14,16 @@ if [ "${platform}" = "freebsd" ]; then
pkg install -y \
bash \
curl \
devel/ruby-gems \
git \
gtar \
mercurial \
python \
rsync \
ruby \
subversion \
sudo \
zip \
&& break
echo "Failed to install packages. Sleeping before trying again..."
sleep 10
@ -27,10 +34,15 @@ elif [ "${platform}" = "rhel" ]; then
while true; do
yum install -y \
gcc \
git \
mercurial \
python-devel \
python-jinja2 \
python-virtualenv \
python2-cryptography \
rubygems \
subversion \
unzip \
&& break
echo "Failed to install packages. Sleeping before trying again..."
sleep 10