From a974997b47b01b7dbe884b0e941b7abe9ab61fc8 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 20 Dec 2018 14:46:03 -0500 Subject: [PATCH] Use -f1 (forks) over serial for gate testing Because we us a single VM for all-in-one testing, switch to forks to ensure we only run 1 task at a time. Change-Id: Ia933ec0efc6d04ac02300f3d82faf26cd583d1d1 Signed-off-by: Paul Belanger --- playbooks/bootstrap.yaml | 6 ------ playbooks/nodepool.yaml | 15 --------------- playbooks/zuul.yaml | 15 --------------- tests/playbooks/run.yaml | 2 +- 4 files changed, 1 insertion(+), 37 deletions(-) diff --git a/playbooks/bootstrap.yaml b/playbooks/bootstrap.yaml index 6e8d388..dbe1639 100644 --- a/playbooks/bootstrap.yaml +++ b/playbooks/bootstrap.yaml @@ -14,9 +14,6 @@ --- - name: Bootstrap nodes hosts: all,!bastion - # NOTE(pabelanger): Because we are currently using a single host, we need this - # operation to be serial. When we switch to multi-host, this can be removed. - serial: 1 pre_tasks: - name: Update apt cache @@ -33,9 +30,6 @@ - name: Bootstrap python dependencies for windmill hosts: all,!bastion,!zookeeper - # NOTE(pabelanger): Because we are currently using a single host, we need this - # operation to be serial. When we switch to multi-host, this can be removed. - serial: 1 tasks: - name: Setup openstack.virtualenv role diff --git a/playbooks/nodepool.yaml b/playbooks/nodepool.yaml index a85c83d..ecbf3d3 100644 --- a/playbooks/nodepool.yaml +++ b/playbooks/nodepool.yaml @@ -14,11 +14,6 @@ --- - name: Bootstrap nodepool hosts hosts: nodepool - # TODO(pabelanger): We really don't want to use serial here, but this allows - # us to still support a single node install. What we should do here is expose - # some sort of variable to only toggle this when we are doing a single node - # install. Otherwise, we just slow down multinode deployments. - serial: 1 tasks: # NOTE(pabelanger): Because of ordering issues create the required home @@ -32,11 +27,6 @@ - name: Bootstrap nodepool-builder hosts: nodepool-builder - # TODO(pabelanger): We really don't want to use serial here, but this allows - # us to still support a single node install. What we should do here is expose - # some sort of variable to only toggle this when we are doing a single node - # install. Otherwise, we just slow down multinode deployments. - serial: 1 tasks: - name: Setup openstack.ssh role @@ -59,11 +49,6 @@ - name: Bootstrap nodepool hosts hosts: nodepool - # TODO(pabelanger): We really don't want to use serial here, but this allows - # us to still support a single node install. What we should do here is expose - # some sort of variable to only toggle this when we are doing a single node - # install. Otherwise, we just slow down multinode deployments. - serial: 1 tasks: - name: Setup openstack.openstacksdk role diff --git a/playbooks/zuul.yaml b/playbooks/zuul.yaml index 3c2e9c9..9edd324 100644 --- a/playbooks/zuul.yaml +++ b/playbooks/zuul.yaml @@ -14,11 +14,6 @@ --- - name: Bootstrap zuul-executor and zuul-scheduler hosts: zuul-executor, zuul-scheduler - # TODO(pabelanger): We really don't want to use serial here, but this allows - # us to still support a single node install. What we should do here is expose - # some sort of variable to only toggle this when we are doing a single node - # install. Otherwise, we just slow down multinode deployments. - serial: 1 tasks: # NOTE(pabelanger): Because of ordering issues create the required home @@ -36,11 +31,6 @@ - name: Bootstrap zuul-executor hosts: zuul-executor - # TODO(pabelanger): We really don't want to use serial here, but this allows - # us to still support a single node install. What we should do here is expose - # some sort of variable to only toggle this when we are doing a single node - # install. Otherwise, we just slow down multinode deployments. - serial: 1 tasks: # TODO(pabelanger): I'm thinking we should likely create @@ -53,11 +43,6 @@ - name: Install zuul hosts: zuul - # TODO(pabelanger): We really don't want to use serial here, but this allows - # us to still support a single node install. What we should do here is expose - # some sort of variable to only toggle this when we are doing a single node - # install. Otherwise, we just slow down multinode deployments. - serial: 1 tasks: - name: Setup openstack.zuul role diff --git a/tests/playbooks/run.yaml b/tests/playbooks/run.yaml index 2c1948c..7dbaa66 100644 --- a/tests/playbooks/run.yaml +++ b/tests/playbooks/run.yaml @@ -9,7 +9,7 @@ - name: Run ansible-playbook for site.yaml args: chdir: "{{ windmill_src_dir }}" - shell: "tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/site.yaml -e @{{ windmill_extra_vars_file }}" + shell: "tox -evenv -- ansible-playbook -f1 -i inventory/testing/hosts playbooks/site.yaml -e @{{ windmill_extra_vars_file }}" - name: Run ansible-playbook for prove.yaml args: