Cirrus: timestamp all output script output

Also remove direct time-stamping by CI scripts that would compete.

Signed-off-by: Chris Evich <cevich@redhat.com>

1 files changed, 32 insertions, 29 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index 6ab8beda3..e411f555c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -23,6 +23,9 @@ env:
     SCRIPT_BASE: "./contrib/cirrus"
     PACKER_BASE: "./contrib/cirrus/packer"
     CIRRUS_CLONE_DEPTH: 200
+    # Command to prefix every output line with a timestamp
+    # (can't do inline awk script, Cirrus-CI or YAML mangles quoting)
+    TIMESTAMP: "awk --file ${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/timestamp.awk"
 
     ####
     #### Cache-image names to test with
@@ -121,21 +124,21 @@ gating_task:
 
     gate_script:
         # N/B: entrypoint.sh resets $GOSRC (same as make clean)
-        - '/usr/local/bin/entrypoint.sh install.tools'
-        - '/usr/local/bin/entrypoint.sh validate'
-        - '/usr/local/bin/entrypoint.sh lint'
-        - '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/test/test_dot_cirrus_yaml.py'
+        - '/usr/local/bin/entrypoint.sh install.tools |& ${TIMESTAMP}'
+        - '/usr/local/bin/entrypoint.sh validate |& ${TIMESTAMP}'
+        - '/usr/local/bin/entrypoint.sh lint |& ${TIMESTAMP}'
+        - '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/test/test_dot_cirrus_yaml.py |& ${TIMESTAMP}'
 
     # This task builds Podman with different buildtags to ensure the build does
     # not break.  It also verifies all sub-commands have man pages.
     build_script:
-        - '/usr/local/bin/entrypoint.sh podman'
-        - 'cd $GOSRC && ./hack/podman-commands.sh'
+        - '/usr/local/bin/entrypoint.sh podman |& ${TIMESTAMP}'
+        - 'cd $GOSRC && ./hack/podman-commands.sh |& ${TIMESTAMP}'
         # N/B: need 'clean' so some commited files are re-generated.
-        - '/usr/local/bin/entrypoint.sh clean podman-remote'
-        - '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp"'
-        - '/usr/local/bin/entrypoint.sh podman-remote-darwin'
-        - '/usr/local/bin/entrypoint.sh podman-remote-windows'
+        - '/usr/local/bin/entrypoint.sh clean podman-remote |& ${TIMESTAMP}'
+        - '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp" |& ${TIMESTAMP}'
+        - '/usr/local/bin/entrypoint.sh podman-remote-darwin |& ${TIMESTAMP}'
+        - '/usr/local/bin/entrypoint.sh podman-remote-windows |& ${TIMESTAMP}'
 
     on_failure:
         failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh'
@@ -162,12 +165,12 @@ vendor_task:
     timeout_in: 30m
 
     vendor_script:
-        - '/usr/local/bin/entrypoint.sh .install.vndr'
-        - '/usr/local/bin/entrypoint.sh vendor'
-        - 'cd /go/src/github.com/containers/libpod && ./hack/tree_status.sh'
+        - '/usr/local/bin/entrypoint.sh .install.vndr |& ${TIMESTAMP}'
+        - '/usr/local/bin/entrypoint.sh vendor |& ${TIMESTAMP}'
+        - 'cd /go/src/github.com/containers/libpod && ./hack/tree_status.sh |& ${TIMESTAMP}'
 
     on_failure:
-        failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh'
+        failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh |& ${TIMESTAMP}'
 
 
 build_each_commit_task:
@@ -188,10 +191,10 @@ build_each_commit_task:
 
     timeout_in: 30m
 
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh'
+    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
     build_each_commit_script:
-        - 'git fetch --depth $CIRRUS_CLONE_DEPTH origin $CIRRUS_BASE_BRANCH'
-        - 'env GOPATH=/var/tmp/go/ make build-all-new-commits GIT_BASE_BRANCH=origin/$CIRRUS_BASE_BRANCH'
+        - 'git fetch --depth $CIRRUS_CLONE_DEPTH origin $CIRRUS_BASE_BRANCH |& ${TIMESTAMP}'
+        - 'env GOPATH=/var/tmp/go/ make build-all-new-commits GIT_BASE_BRANCH=origin/$CIRRUS_BASE_BRANCH |& ${TIMESTAMP}'
 
     on_failure:
         failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh'
@@ -218,7 +221,7 @@ meta_task:
         GCPPROJECT: ENCRYPTED[7c80e728e046b1c76147afd156a32c1c57d4a1ac1eab93b7e68e718c61ca8564fc61fef815952b8ae0a64e7034b8fe4f]
         CIRRUS_CLONE_DEPTH: 1  # source not used
 
-    script: '/usr/local/bin/entrypoint.sh'
+    script: '/usr/local/bin/entrypoint.sh |& ${TIMESTAMP}'
 
 
 # This task does the unit and integration testing for every platform
@@ -251,9 +254,9 @@ testing_task:
 
     # Every *_script runs in sequence, for each task. The name prefix is for
     # WebUI reference.  The values may be strings...
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh'
-    unit_test_script: '$SCRIPT_BASE/unit_test.sh'
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh'
+    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
+    unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}'
+    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
     audit_log_script: 'cat /var/log/audit/audit.log || cat /var/log/kern.log'
     journalctl_b_script: 'journalctl -b'
 
@@ -287,8 +290,8 @@ special_testing_task:
 
     timeout_in: 120m
 
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh'
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh'
+    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
+    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
     audit_log_script: 'cat /var/log/audit/audit.log || cat /var/log/kern.log'
     journalctl_b_script: 'journalctl -b'
 
@@ -323,8 +326,8 @@ optional_testing_task:
 
     timeout_in: 60m
 
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh'
-    system_test_script: '$SCRIPT_BASE/system_test.sh'
+    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
+    system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
 
 
 # Build new cache-images for future PR testing, but only after a PR merge.
@@ -357,8 +360,8 @@ cache_images_task:
         scopes:
             - compute
             - devstorage.full_control
-    environment_script: '$SCRIPT_BASE/setup_environment.sh'
-    build_vm_images_script: '$SCRIPT_BASE/build_vm_images.sh'
+    environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
+    build_vm_images_script: '$SCRIPT_BASE/build_vm_images.sh |& ${TIMESTAMP}'
 
     # TODO,Continuous Delivery: Automatically open a libpod PR after using 'sed' to replace
     #                           the image_names with the new (just build) images.  That will
@@ -372,7 +375,7 @@ cache_images_task:
     #   - commit_and_create_upstream_pr.sh
 
     on_failure:
-        failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh'
+        failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh |& ${TIMESTAMP}'
 
 
 # Post message to IRC if everything passed
@@ -395,4 +398,4 @@ success_task:
         cpu: 1
         memory: 1
 
-    success_script: '$SCRIPT_BASE/success.sh'
+    success_script: '$SCRIPT_BASE/success.sh |& ${TIMESTAMP}'