Merge pull request openshift#1555 from richm/fix-merge-json-log-test

guard against MERGE_JSON_LOG test flakes

Author: openshift-merge-robot

fluentd/configs.d/openshift/filter-viaq-data-model.conf

@@ -1,6 +1,6 @@
 <filter **>
   @type viaq_data_model
-  default_keep_fields CEE,@timestamp,aushape,ci_job,collectd,docker,fedora-ci,file,foreman,geoip,hostname,ipaddr4,ipaddr6,kubernetes,level,message,namespace_name,namespace_uuid,offset,openstack,ovirt,pid,pipeline_metadata,rsyslog,service,systemd,tags,testcase,tlog,viaq_msg_id
+  default_keep_fields CEE,time,@timestamp,aushape,ci_job,collectd,docker,fedora-ci,file,foreman,geoip,hostname,ipaddr4,ipaddr6,kubernetes,level,message,namespace_name,namespace_uuid,offset,openstack,ovirt,pid,pipeline_metadata,rsyslog,service,systemd,tags,testcase,tlog,viaq_msg_id
   extra_keep_fields "#{ENV['CDM_EXTRA_KEEP_FIELDS'] || ''}"
   keep_empty_fields "#{ENV['CDM_KEEP_EMPTY_FIELDS'] || 'message'}"
   use_undefined "#{ENV['CDM_USE_UNDEFINED'] || false}"

test/json-parsing.sh

@@ -27,10 +27,17 @@ cleanup() {
     if [ -n "${fpod:-}" ] ; then
         get_fluentd_pod_log > $ARTIFACT_DIR/json-parsing-fluentd-pod.log
     fi
-    # disable merge json log
-    stop_fluentd
-    oc set env $fluentd_ds MERGE_JSON_LOG=false
-    start_fluentd
+    if [ "${orig_MERGE_JSON_LOG:-}" = unset ] ; then
+        orig_MERGE_JSON_LOG="MERGE_JSON_LOG-"
+    fi
+    if [ "${orig_CDM_UNDEFINED_TO_STRING:-}" = unset ] ; then
+        orig_CDM_UNDEFINED_TO_STRING="CDM_UNDEFINED_TO_STRING-"
+    fi
+    if [ -n "${orig_MERGE_JSON_LOG:-}" -o -n "${orig_CDM_UNDEFINED_TO_STRING:-}" ] ; then
+        stop_fluentd
+        oc set env $fluentd_ds ${orig_MERGE_JSON_LOG:-} ${orig_CDM_UNDEFINED_TO_STRING:-}
+        start_fluentd
+    fi
     # this will call declare_test_end, suite_end, etc.
     os::test::junit::reconcile_output
     exit $return_code
@@ -40,6 +47,14 @@ trap "cleanup" EXIT
 os::log::info Starting json-parsing test at $( date )
 
 # enable merge json log
+orig_MERGE_JSON_LOG=$( oc set env $fluentd_ds --list | grep \^MERGE_JSON_LOG= ) || :
+if [ -z "$orig_MERGE_JSON_LOG" ] ; then
+    orig_MERGE_JSON_LOG=unset
+fi
+orig_CDM_UNDEFINED_TO_STRING=$( oc set env $fluentd_ds --list | grep \^CDM_UNDEFINED_TO_STRING= ) || :
+if [ -z "$orig_CDM_UNDEFINED_TO_STRING" ] ; then
+    orig_CDM_UNDEFINED_TO_STRING=unset
+fi
 stop_fluentd
 oc set env $fluentd_ds MERGE_JSON_LOG=true CDM_UNDEFINED_TO_STRING=false
 start_fluentd