diff options
| author | Sachin Prabhu <sprabhu@redhat.com> | 2020-05-17 02:05:10 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2020-05-18 13:05:50 +0200 |
| commit | 479b4e9cf1a93eaf6d169d840c339c6dfce84f64 (patch) | |
| tree | 6d873b9442b88b61b7078ef8e25950e6f39f97b8 /vagrant | |
| parent | 0d3a7d0697bf0fc9b011c7bff512be2a0364817c (diff) | |
| download | samba-integration-479b4e9cf1a93eaf6d169d840c339c6dfce84f64.tar.gz samba-integration-479b4e9cf1a93eaf6d169d840c339c6dfce84f64.tar.xz samba-integration-479b4e9cf1a93eaf6d169d840c339c6dfce84f64.zip | |
Split out running tests from setup of client machines
At the moment we run the tests in the same playbook as setting up of the
client machines. With this patch we separate out these two distinct
processes.
This will also allow easier development of tests as it reduces the time
required to run the tests on an existing environment.
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/Makefile | 7 | ||||
| -rw-r--r-- | vagrant/ansible/Makefile | 5 | ||||
| -rw-r--r-- | vagrant/ansible/client-test.yml | 8 | ||||
| -rw-r--r-- | vagrant/ansible/setup-clients.yml | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/vagrant/Makefile b/vagrant/Makefile index ce885c5..1702e4d 100644 --- a/vagrant/Makefile +++ b/vagrant/Makefile @@ -31,9 +31,12 @@ setup.cluster: setup.prep setup.test.only setup.cluster.only setup.clients: @$(VSSH) setup "${SSH_EXTRA_VARS} make -C /home/vagrant/ansible setup.clients" -setup.site: setup.cluster setup.clients +client.test: + @$(VSSH) setup "${SSH_EXTRA_VARS} make -C /home/vagrant/ansible client.test" + +setup.site: setup.cluster setup.clients client.test client1.test: @$(VSSH) client1 "sudo make -C /root/samba-integration-tests test" -.PHONY: local hosts.update.only setup.prep.only setup.prep setup.test.only setup.cluster.only setup.cluster setup.clients setup.site client1.test +.PHONY: local hosts.update.only setup.prep.only setup.prep setup.test.only setup.cluster.only setup.cluster setup.clients client.test setup.site client1.test diff --git a/vagrant/ansible/Makefile b/vagrant/ansible/Makefile index a0c6c95..558338e 100644 --- a/vagrant/ansible/Makefile +++ b/vagrant/ansible/Makefile @@ -13,6 +13,9 @@ setup.cluster: setup.clients: @ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./setup-clients.yml -setup.site: setup.cluster setup.clients +client.test: + @ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./client-test.yml + +setup.site: setup.cluster setup.clients client.test .PHONY: setup.cluster setup.clients setup.site diff --git a/vagrant/ansible/client-test.yml b/vagrant/ansible/client-test.yml new file mode 100644 index 0000000..cb93685 --- /dev/null +++ b/vagrant/ansible/client-test.yml @@ -0,0 +1,8 @@ +- hosts: clients + become: yes + become_method: sudo + vars_files: + - cluster-vars.yml + roles: + - client.test.prep + - client.test diff --git a/vagrant/ansible/setup-clients.yml b/vagrant/ansible/setup-clients.yml index f6cf516..47eecbb 100644 --- a/vagrant/ansible/setup-clients.yml +++ b/vagrant/ansible/setup-clients.yml @@ -6,5 +6,3 @@ roles: - common.prep - client.prep - - client.test.prep - - client.test |