diff options
| author | Ian Wienand <iwienand@redhat.com> | 2022-07-19 13:46:53 +1000 |
|---|---|---|
| committer | Ian Wienand <iwienand@redhat.com> | 2022-07-21 10:33:29 +1000 |
| commit | 0c0ec6e5802259bfc7da1b75a9e5d574c2227002 (patch) | |
| tree | 8832562866e7a689a8423e87ce0585f35a92b426 /playbooks/zuul-stream/fixtures/test-stream.yaml | |
| parent | 559602910ff57f90e6478e748d17e0e298430c73 (diff) | |
| download | zuul-0c0ec6e5802259bfc7da1b75a9e5d574c2227002.tar.gz | |
zuul-stream: start new console for stream tests
The zuul-stream-functional tests currently run Ansible against two
hosts (node1 and node2) started by the "infrastructure" Zuul. However
the tests are working with the zuul_console running on the default
port 19885 -- which is the zuul_console started by the setup jobs at
[1].
The result of this is that this test is only talking to a zuul_console
instance started from the current executor's code, not the Zuul
checkout uder test -- i.e. changes to zuul_console.py aren't tested by
this change.
This modifies the job playbook to have another step that can start its
own zuul_console service on the two hosts running at another port
(19887). This way we can test against the zuul_console code from the
Zuul checkout. A new step is added to run a playbook overriding to
this port.
We retain the existing test (against the already running port 19885)
as a backwards compatability test; although we don't exactly know what
this is running (as it comes from OpenDev's production executors) we
want changes to the console log/stream callback to be able to run
against it, as it may represent what is running a static node.
The test results are pulled apart a bit to be more explicit, logging
and testing each run separately.
[1] https://opendev.org/zuul/zuul-jobs/src/branch/master/roles/prepare-workspace/tasks/main.yaml#L2
Change-Id: Ib11b77cfdc6c59d12807c6d9684c3e653ccad863
Diffstat (limited to 'playbooks/zuul-stream/fixtures/test-stream.yaml')
| -rw-r--r-- | playbooks/zuul-stream/fixtures/test-stream.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/playbooks/zuul-stream/fixtures/test-stream.yaml b/playbooks/zuul-stream/fixtures/test-stream.yaml index 05b75daf9..0c10304b2 100644 --- a/playbooks/zuul-stream/fixtures/test-stream.yaml +++ b/playbooks/zuul-stream/fixtures/test-stream.yaml @@ -1,3 +1,16 @@ +- name: Start zuul stream daemon + hosts: node + tasks: + + # NOTE : when new_console is set, this playbook runs with + # ZUUL_CONSOLE_PORT=19887 so that we test with the zuul_console + # from the Zuul checkout, and not the one started by test + # infrastructure. + - name: Start zuul_console on non-default port + zuul_console: + port: 19887 + when: new_console | default(false) + - name: Run some commands to show that logging works hosts: node tasks: |