From d3db4be8f2de5c2c962b0d5d894613e2f1715d2d Mon Sep 17 00:00:00 2001 From: Jim Perrin Date: Nov 21 2014 17:05:40 +0000 Subject: include patch from jfilak, useful defaults #bug 7914 --- diff --git a/SOURCES/1001-Provide-generic-workflows.patch b/SOURCES/1001-Provide-generic-workflows.patch new file mode 100644 index 0000000..de36bdc --- /dev/null +++ b/SOURCES/1001-Provide-generic-workflows.patch @@ -0,0 +1,287 @@ +From e0c0529a3ca1805ee1648e2aad24b3f8d5de4773 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Thu, 20 Nov 2014 11:49:48 +0100 +Subject: [PATCH] Provide generic workflows + +Add workflow for logger, mailx and reportuploader. +Disable Red Hat Support workflow. +--- + po/POTFILES.in | 5 +++++ + src/workflows/Makefile.am | 24 +++++++++++++++++++----- + src/workflows/report_logger.conf | 6 ++++++ + src/workflows/report_mailx.conf | 6 ++++++ + src/workflows/report_rhel.conf | 14 +++++++------- + src/workflows/report_uploader.conf | 6 ++++++ + src/workflows/workflow_Logger.xml.in | 11 +++++++++++ + src/workflows/workflow_LoggerCCpp.xml.in | 12 ++++++++++++ + src/workflows/workflow_Mailx.xml.in | 11 +++++++++++ + src/workflows/workflow_MailxCCpp.xml.in | 12 ++++++++++++ + src/workflows/workflow_Upload.xml.in | 3 +-- + src/workflows/workflow_UploadCCpp.xml.in | 12 ++++++++++++ + 12 files changed, 108 insertions(+), 14 deletions(-) + create mode 100644 src/workflows/report_logger.conf + create mode 100644 src/workflows/report_mailx.conf + create mode 100644 src/workflows/report_uploader.conf + create mode 100644 src/workflows/workflow_Logger.xml.in + create mode 100644 src/workflows/workflow_LoggerCCpp.xml.in + create mode 100644 src/workflows/workflow_Mailx.xml.in + create mode 100644 src/workflows/workflow_MailxCCpp.xml.in + create mode 100644 src/workflows/workflow_UploadCCpp.xml.in + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 26acba1..7ba080c 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -55,6 +55,11 @@ src/workflows/workflow_FedoraVmcore.xml.in + src/workflows/workflow_FedoraXorg.xml.in + src/workflows/workflow_FedoraLibreport.xml.in + src/workflows/workflow_FedoraJava.xml.in ++src/workflows/workflow_LoggerCCpp.xml.in ++src/workflows/workflow_Logger.xml.in ++src/workflows/workflow_MailxCCpp.xml.in ++src/workflows/workflow_Mailx.xml.in ++src/workflows/workflow_UploadCCpp.xml.in + src/workflows/workflow_Upload.xml.in + src/workflows/workflow_RHELCCpp.xml.in + src/workflows/workflow_RHELKerneloops.xml.in +diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am +index 54a6f31..0fc1019 100644 +--- a/src/workflows/Makefile.am ++++ b/src/workflows/Makefile.am +@@ -8,14 +8,19 @@ dist_workflows_DATA = \ + workflow_FedoraXorg.xml \ + workflow_FedoraLibreport.xml \ + workflow_FedoraJava.xml \ +- workflow_Upload.xml \ + workflow_RHELCCpp.xml \ + workflow_RHELKerneloops.xml \ + workflow_RHELPython.xml \ + workflow_RHELvmcore.xml \ + workflow_RHELxorg.xml \ + workflow_RHELLibreport.xml \ +- workflow_RHELJava.xml ++ workflow_RHELJava.xml \ ++ workflow_Mailx.xml \ ++ workflow_MailxCCpp.xml \ ++ workflow_Upload.xml \ ++ workflow_UploadCCpp.xml \ ++ workflow_Logger.xml \ ++ workflow_LoggerCCpp.xml + + if BUILD_BUGZILLA + dist_workflows_DATA += \ +@@ -36,7 +41,10 @@ workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR) + + dist_workflowsdef_DATA =\ + report_fedora.conf \ +- report_rhel.conf ++ report_rhel.conf \ ++ report_mailx.conf \ ++ report_logger.conf \ ++ report_uploader.conf + + if BUILD_BUGZILLA + dist_workflowsdef_DATA += \ +@@ -54,14 +62,20 @@ EXTRA_DIST = \ + workflow_FedoraXorg.xml.in \ + workflow_FedoraLibreport.xml.in \ + workflow_FedoraJava.xml.in \ +- workflow_Upload.xml.in \ + workflow_RHELCCpp.xml.in \ + workflow_RHELKerneloops.xml.in \ + workflow_RHELPython.xml.in \ + workflow_RHELvmcore.xml.in \ + workflow_RHELxorg.xml.in \ + workflow_RHELLibreport.xml.in \ +- workflow_RHELJava.xml.in ++ workflow_RHELJava.xml.in \ ++ workflow_Mailx.xml.in \ ++ workflow_MailxCCpp.xml.in \ ++ workflow_Upload.xml.in \ ++ workflow_UploadCCpp.xml.in \ ++ workflow_Logger.xml.in \ ++ workflow_LoggerCCpp.xml.in ++ + + if BUILD_BUGZILLA + EXTRA_DIST += \ +diff --git a/src/workflows/report_logger.conf b/src/workflows/report_logger.conf +new file mode 100644 +index 0000000..06f28e1 +--- /dev/null ++++ b/src/workflows/report_logger.conf +@@ -0,0 +1,6 @@ ++EVENT=workflow_LoggerCCpp analyzer=CCpp ++# this is just a meta event which consists of other events ++# the list is defined in the xml file ++ ++EVENT=workflow_Logger analyzer!=CCpp ++# this must be changed with new workflow +diff --git a/src/workflows/report_mailx.conf b/src/workflows/report_mailx.conf +new file mode 100644 +index 0000000..0e38e76 +--- /dev/null ++++ b/src/workflows/report_mailx.conf +@@ -0,0 +1,6 @@ ++EVENT=workflow_MailxCCpp analyzer=CCpp ++# this is just a meta event which consists of other events ++# the list is defined in the xml file ++ ++EVENT=workflow_Mailx analyzer!=CCpp ++# this must be changed with new workflow +diff --git a/src/workflows/report_rhel.conf b/src/workflows/report_rhel.conf +index 38ee231..d32bde4 100644 +--- a/src/workflows/report_rhel.conf ++++ b/src/workflows/report_rhel.conf +@@ -1,27 +1,27 @@ +-EVENT=workflow_RHELLibreport analyzer=libreport ++#EVENT=workflow_RHELLibreport analyzer=libreport + # this is just a meta event which consists of other events + # the list is defined in the xml file + +-EVENT=workflow_RHELCCpp analyzer=CCpp ++#EVENT=workflow_RHELCCpp analyzer=CCpp + # this is just a meta event which consists of other events + # the list is defined in the xml file + +-EVENT=workflow_RHELPython analyzer=Python component!=anaconda ++#EVENT=workflow_RHELPython analyzer=Python component!=anaconda + # this is just a meta event which consists of other events + # the list is defined in the xml file + +-EVENT=workflow_RHELKerneloops analyzer=Kerneloops ++#EVENT=workflow_RHELKerneloops analyzer=Kerneloops + # this is just a meta event which consists of other events + # the list is defined in the xml file + +-EVENT=workflow_RHELvmcore analyzer=vmcore ++#EVENT=workflow_RHELvmcore analyzer=vmcore + # this is just a meta event which consists of other events + # the list is defined in the xml file + +-EVENT=workflow_RHELxorg analyzer=xorg ++#EVENT=workflow_RHELxorg analyzer=xorg + # this is just a meta event which consists of other events + # the list is defined in the xml file + +-EVENT=workflow_RHELJava analyzer=Java ++#EVENT=workflow_RHELJava analyzer=Java + # this is just a meta event which consists of other events + # the list is defined in the xml file +diff --git a/src/workflows/report_uploader.conf b/src/workflows/report_uploader.conf +new file mode 100644 +index 0000000..428fe9d +--- /dev/null ++++ b/src/workflows/report_uploader.conf +@@ -0,0 +1,6 @@ ++EVENT=workflow_UploadCCpp analyzer=CCpp ++# this is just a meta event which consists of other events ++# the list is defined in the xml file ++ ++EVENT=workflow_Upload analyzer!=CCpp ++# this must be changed with new workflow +diff --git a/src/workflows/workflow_Logger.xml.in b/src/workflows/workflow_Logger.xml.in +new file mode 100644 +index 0000000..3ffe878 +--- /dev/null ++++ b/src/workflows/workflow_Logger.xml.in +@@ -0,0 +1,11 @@ ++ ++ ++ <_name>Export the problem data information to a text file ++ <_description>Analyze the problem locally and export the problem data information to a text file ++ -99 ++ ++ ++ collect_* ++ report_Logger ++ ++ +diff --git a/src/workflows/workflow_LoggerCCpp.xml.in b/src/workflows/workflow_LoggerCCpp.xml.in +new file mode 100644 +index 0000000..9a67e7e +--- /dev/null ++++ b/src/workflows/workflow_LoggerCCpp.xml.in +@@ -0,0 +1,12 @@ ++ ++ ++ <_name>Export the problem data information to a text file ++ <_description>Analyze the problem locally and export the problem data information to a text file ++ -99 ++ ++ ++ collect_* ++ analyze_LocalGDB ++ report_Logger ++ ++ +diff --git a/src/workflows/workflow_Mailx.xml.in b/src/workflows/workflow_Mailx.xml.in +new file mode 100644 +index 0000000..63bd576 +--- /dev/null ++++ b/src/workflows/workflow_Mailx.xml.in +@@ -0,0 +1,11 @@ ++ ++ ++ <_name>Send the problem data via email ++ <_description>Analyze the problem locally and send information via email ++ -99 ++ ++ ++ collect_* ++ report_Mailx ++ ++ +diff --git a/src/workflows/workflow_MailxCCpp.xml.in b/src/workflows/workflow_MailxCCpp.xml.in +new file mode 100644 +index 0000000..7b5c9fc +--- /dev/null ++++ b/src/workflows/workflow_MailxCCpp.xml.in +@@ -0,0 +1,12 @@ ++ ++ ++ <_name>Send the problem data via email ++ <_description>Analyze the problem locally and send information via email ++ -99 ++ ++ ++ collect_* ++ analyze_LocalGDB ++ report_Mailx ++ ++ +diff --git a/src/workflows/workflow_Upload.xml.in b/src/workflows/workflow_Upload.xml.in +index 3965f99..a0bc658 100644 +--- a/src/workflows/workflow_Upload.xml.in ++++ b/src/workflows/workflow_Upload.xml.in +@@ -5,7 +5,6 @@ + + + collect_* +- analyze_CCpp + report_Uploader + +- +\ No newline at end of file ++ +diff --git a/src/workflows/workflow_UploadCCpp.xml.in b/src/workflows/workflow_UploadCCpp.xml.in +new file mode 100644 +index 0000000..fbb9a23 +--- /dev/null ++++ b/src/workflows/workflow_UploadCCpp.xml.in +@@ -0,0 +1,12 @@ ++ ++ ++ <_name>Upload the problem data to a server ++ <_description>Analyze the problem locally and upload the data via scp or ftp ++ -99 ++ ++ ++ collect_* ++ analyze_LocalGDB ++ report_Uploader ++ ++ +-- +1.8.3.1 + diff --git a/SOURCES/1003-Add-uReport-workflow.patch b/SOURCES/1003-Add-uReport-workflow.patch new file mode 100644 index 0000000..b7a17a5 --- /dev/null +++ b/SOURCES/1003-Add-uReport-workflow.patch @@ -0,0 +1,88 @@ +From ef137f9665e9d39097eca53faf88bd4069fb4495 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Fri, 21 Nov 2014 07:21:48 +0100 +Subject: [PATCH] Add uReport workflow + +--- + po/POTFILES.in | 1 + + src/workflows/Makefile.am | 9 ++++++--- + src/workflows/report_ureport.conf | 3 +++ + src/workflows/workflow_uReport.xml.in | 10 ++++++++++ + 4 files changed, 20 insertions(+), 3 deletions(-) + create mode 100644 src/workflows/report_ureport.conf + create mode 100644 src/workflows/workflow_uReport.xml.in + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 7ba080c..4a83d8e 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -61,6 +61,7 @@ src/workflows/workflow_MailxCCpp.xml.in + src/workflows/workflow_Mailx.xml.in + src/workflows/workflow_UploadCCpp.xml.in + src/workflows/workflow_Upload.xml.in ++src/workflows/workflow_uReport.xml.in + src/workflows/workflow_RHELCCpp.xml.in + src/workflows/workflow_RHELKerneloops.xml.in + src/workflows/workflow_RHELPython.xml.in +diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am +index 0fc1019..801f663 100644 +--- a/src/workflows/Makefile.am ++++ b/src/workflows/Makefile.am +@@ -20,7 +20,8 @@ dist_workflows_DATA = \ + workflow_Upload.xml \ + workflow_UploadCCpp.xml \ + workflow_Logger.xml \ +- workflow_LoggerCCpp.xml ++ workflow_LoggerCCpp.xml \ ++ workflow_uReport.xml + + if BUILD_BUGZILLA + dist_workflows_DATA += \ +@@ -44,7 +45,8 @@ dist_workflowsdef_DATA =\ + report_rhel.conf \ + report_mailx.conf \ + report_logger.conf \ +- report_uploader.conf ++ report_uploader.conf \ ++ report_ureport.conf + + if BUILD_BUGZILLA + dist_workflowsdef_DATA += \ +@@ -74,7 +76,8 @@ EXTRA_DIST = \ + workflow_Upload.xml.in \ + workflow_UploadCCpp.xml.in \ + workflow_Logger.xml.in \ +- workflow_LoggerCCpp.xml.in ++ workflow_LoggerCCpp.xml.in \ ++ workflow_uReport.xml.in + + + if BUILD_BUGZILLA +diff --git a/src/workflows/report_ureport.conf b/src/workflows/report_ureport.conf +new file mode 100644 +index 0000000..8d76d5a +--- /dev/null ++++ b/src/workflows/report_ureport.conf +@@ -0,0 +1,3 @@ ++EVENT=workflow_uReport ++# this is just a meta event which consists of other events ++# the list is defined in the xml file +diff --git a/src/workflows/workflow_uReport.xml.in b/src/workflows/workflow_uReport.xml.in +new file mode 100644 +index 0000000..4d2f3d9 +--- /dev/null ++++ b/src/workflows/workflow_uReport.xml.in +@@ -0,0 +1,10 @@ ++ ++ ++ <_name>Submit anonymous crash static data ++ <_description>Sends a uReport to ABRT crash statistics server ++ 0 ++ ++ ++ report_uReport ++ ++ +-- +1.8.3.1 + diff --git a/SOURCES/1005-use-public-ABRT-server.patch b/SOURCES/1005-use-public-ABRT-server.patch new file mode 100644 index 0000000..05eb3fd --- /dev/null +++ b/SOURCES/1005-use-public-ABRT-server.patch @@ -0,0 +1,46 @@ +From 0a7060b79ca5854c874b3bfb30a604c9e0b60e42 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Fri, 21 Nov 2014 08:33:28 +0100 +Subject: [PATCH] use public ABRT server + +--- + src/plugins/report_uReport.xml.in | 2 +- + src/plugins/ureport.conf | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/report_uReport.xml.in b/src/plugins/report_uReport.xml.in +index c8bb858..f7c91f7 100644 +--- a/src/plugins/report_uReport.xml.in ++++ b/src/plugins/report_uReport.xml.in +@@ -11,7 +11,7 @@ + <_label>uReport Server URL + no + <_description>Address of uReport webservice +- http://bug-report.itos.redhat.com ++ https://retrace.fedoraproject.org/faf/ + +