summaryrefslogtreecommitdiff
path: root/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/zuul-stream/fixtures/test-stream.yaml8
-rw-r--r--playbooks/zuul-stream/functional.yaml9
2 files changed, 16 insertions, 1 deletions
diff --git a/playbooks/zuul-stream/fixtures/test-stream.yaml b/playbooks/zuul-stream/fixtures/test-stream.yaml
index 0326ae54e..488f8cb2f 100644
--- a/playbooks/zuul-stream/fixtures/test-stream.yaml
+++ b/playbooks/zuul-stream/fixtures/test-stream.yaml
@@ -11,6 +11,14 @@
port: 19887
when: new_console | default(false)
+- name: Run command to show skipping works
+ vars:
+ zuul_console_disabled: true
+ hosts: node
+ tasks:
+ - name: Run quiet command
+ command: echo 'This command should not stream'
+
- name: Run some commands to show that logging works
hosts: node
tasks:
diff --git a/playbooks/zuul-stream/functional.yaml b/playbooks/zuul-stream/functional.yaml
index b8a44a87c..1d03e650b 100644
--- a/playbooks/zuul-stream/functional.yaml
+++ b/playbooks/zuul-stream/functional.yaml
@@ -74,7 +74,7 @@
mv job-output.txt job-output-success-19885.txt
mv job-output.json job-output-success-19885.json
- - name: Validate outputs
+ - name: Validate text outputs
include_tasks: validate.yaml
loop:
- { node: 'node1', filename: 'job-output-success-19887.txt' }
@@ -82,6 +82,13 @@
- { node: 'node1', filename: 'job-output-success-19885.txt' }
- { node: 'node2', filename: 'job-output-success-19885.txt' }
+ # This shows that zuul_console_disabled has activated and set the
+ # UUID to "skip"
+ - name: Validate json output
+ shell: |
+ egrep 'zuul_log_id": "skip"' job-output-success-19885.json
+ egrep 'zuul_log_id": "skip"' job-output-success-19887.json
+
# failure case
- name: Run ansible playbook that should fail