zuul/zuul
Code Issues Proposed changes

Merge "zuul-stream: start new console for stream tests"

Browse Source
This commit is contained in:
Zuul
2022-08-09 20:19:53 +00:00
committed by Gerrit Code Review
parent 7c72f0379d 0c0ec6e580
commit d35b9f8c73
4 changed files with 101 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playbooks/zuul-stream/fixtures/test-stream.yaml
+13
View File
@@ -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:
playbooks/zuul-stream/functional.yaml
+44 -42
View File
@@ -7,15 +7,50 @@
# the python version of the platform is changed.
python_path: "/usr/local/lib/python3.10/dist-packages"
- name: Run ansible that should succeed
- name: Run ansible that should succeed against testing console
command: >
/usr/lib/zuul/ansible/{{ zuul_ansible_version }}/bin/ansible-playbook
-e "new_console=true"
src/opendev.org/zuul/zuul/playbooks/zuul-stream/fixtures/test-stream.yaml
environment:
# Setup by test-stream.yaml so we start a new zuul_console
# from this checkout.
ZUUL_CONSOLE_PORT: 19887
ZUUL_JOB_LOG_CONFIG: "{{ ansible_user_dir}}/logging.json"
ZUUL_JOBDIR: "{{ ansible_user_dir}}"
PYTHONPATH: "{{ python_path }}"
- name: Save output
shell: |
mv job-output.txt job-output-success-19887.txt
mv job-output.json job-output-success-19887.json
# NOTE(ianw) 2022-07 : we deliberatly have this second step to run
# against the console setup by the infrastructure executor in the
# job pre playbooks as a backwards compatability sanity check.
- name: Run ansible that should succeed against extant console
command: >
/usr/lib/zuul/ansible/{{ zuul_ansible_version }}/bin/ansible-playbook
-e "new_console=false"
src/opendev.org/zuul/zuul/playbooks/zuul-stream/fixtures/test-stream.yaml
environment:
ZUUL_JOB_LOG_CONFIG: "{{ ansible_user_dir}}/logging.json"
ZUUL_JOBDIR: "{{ ansible_user_dir}}"
PYTHONPATH: "{{ python_path }}"
- name: Save output
shell: |
mv job-output.txt job-output-success-19885.txt
mv job-output.json job-output-success-19885.json
- name: Validate outputs
include_tasks: validate.yaml
loop:
- job-output-success-19887.txt
- job-output-success-19885.txt
# failure case
- name: Run ansible playbook that should fail
command: >
/usr/lib/zuul/ansible/{{ zuul_ansible_version }}/bin/ansible-playbook
@@ -23,55 +58,22 @@
register: failed_results
failed_when: "failed_results.rc != 2"
environment:
ZUUL_CONSOLE_PORT: 19887
ZUUL_JOB_LOG_CONFIG: "{{ ansible_user_dir}}/logging.json"
ZUUL_JOBDIR: "{{ ansible_user_dir}}"
PYTHONPATH: "{{ python_path }}"
- name: Validate output - setupvar
- name: Save output
shell: |
egrep "^.*\| node1 \|\s+\"setupvar\": {" job-output.txt
egrep "^.*\| node2 \|\s+\"setupvar\": {" job-output.txt
- name: Validate output - shell task
shell: |
egrep "^.*\| node1 \| 1: lo:" job-output.txt
egrep "^.*\| node2 \| 1: lo:" job-output.txt
- name: Validate output - loop with items
shell: |
egrep "^.+\| node1 \| ok: Item: item1" job-output.txt
egrep "^.+\| node1 \| ok: Item: item2" job-output.txt
egrep "^.+\| node1 \| ok: Item: item3" job-output.txt
egrep "^.+\| node2 \| ok: Item: item1" job-output.txt
egrep "^.+\| node2 \| ok: Item: item2" job-output.txt
egrep "^.+\| node2 \| ok: Item: item3" job-output.txt
- name: Validate output - loop with complex items
shell: |
egrep "^.+\| node1 \| ok: Item: Runtime" job-output.txt
egrep "^.+\| node2 \| ok: Item: Runtime" job-output.txt
- name: Validate output - failed shell task
shell: |
egrep "^.+\| node1 \| Exception: Test module failure exception task" job-output.txt
egrep "^.+\| node2 \| Exception: Test module failure exception task" job-output.txt
- name: Validate output - item loop with exception
shell: |
egrep "^.+\| node1 \| Exception: Test module failure exception loop" job-output.txt
egrep "^.+\| node2 \| Exception: Test module failure exception loop" job-output.txt
mv job-output.txt job-output-failure.txt
mv job-output.json job-output-failure.json
- name: Validate output - failure shell task with exception
shell: |
egrep "^.+\| node1 \| Exception: Test module failure exception fail-task" job-output.txt
egrep "^.+\| node2 \| Exception: Test module failure exception fail-task" job-output.txt
egrep "^.+\| node1 \| Exception: Test module failure exception fail-task" job-output-failure.txt
egrep "^.+\| node2 \| Exception: Test module failure exception fail-task" job-output-failure.txt
- name: Validate output - failure item loop with exception
shell: |
egrep "^.+\| node1 \| Exception: Test module failure exception fail-loop" job-output.txt
egrep "^.+\| node2 \| Exception: Test module failure exception fail-loop" job-output.txt
- name: Validate output - binary data
shell: |
egrep "^.*\| node1 \| \\\\x80abc" job-output.txt
egrep "^.*\| node2 \| \\\\x80abc" job-output.txt
egrep "^.+\| node1 \| Exception: Test module failure exception fail-loop" job-output-failure.txt
egrep "^.+\| node2 \| Exception: Test module failure exception fail-loop" job-output-failure.txt
playbooks/zuul-stream/post.yaml
+6 -5
View File
@@ -10,9 +10,6 @@
state: directory
delegate_to: localhost
- name: Rename job-output.txt
command: mv job-output.txt stream-job-output.txt
- name: Fetch files
synchronize:
src: "{{ ansible_user_dir }}/{{ item }}"
@@ -21,5 +18,9 @@
with_items:
- logging.json
- ansible.cfg
- stream-job-output.txt
- job-output.json
- job-output-success-19887.txt
- job-output-success-19887.json
- job-output-success-19885.txt
- job-output-success-19885.json
- job-output-failure.txt
- job-output-failure.json
playbooks/zuul-stream/validate.yaml
+38
View File
@@ -0,0 +1,38 @@
- name: Validate output - setupvar
shell: |
egrep "^.*\| node1 \|\s+\"setupvar\": {" {{ item }}
egrep "^.*\| node2 \|\s+\"setupvar\": {" {{ item }}
- name: Validate output - shell task
shell: |
egrep "^.*\| node1 \| 1: lo:" {{ item }}
egrep "^.*\| node2 \| 1: lo:" {{ item }}
- name: Validate output - loop with items
shell: |
egrep "^.+\| node1 \| ok: Item: item1" {{ item }}
egrep "^.+\| node1 \| ok: Item: item2" {{ item }}
egrep "^.+\| node1 \| ok: Item: item3" {{ item }}
egrep "^.+\| node2 \| ok: Item: item1" {{ item }}
egrep "^.+\| node2 \| ok: Item: item2" {{ item }}
egrep "^.+\| node2 \| ok: Item: item3" {{ item }}
- name: Validate output - loop with complex items
shell: |
egrep "^.+\| node1 \| ok: Item: Runtime" {{ item }}
egrep "^.+\| node2 \| ok: Item: Runtime" {{ item }}
- name: Validate output - failed shell task
shell: |
egrep "^.+\| node1 \| Exception: Test module failure exception task" {{ item }}
egrep "^.+\| node2 \| Exception: Test module failure exception task" {{ item }}
- name: Validate output - item loop with exception
shell: |
egrep "^.+\| node1 \| Exception: Test module failure exception loop" {{ item }}
egrep "^.+\| node2 \| Exception: Test module failure exception loop" {{ item }}
- name: Validate output - binary data
shell: |
egrep "^.*\| node1 \| \\\\x80abc" {{ item }}
egrep "^.*\| node2 \| \\\\x80abc" {{ item }}