Bug 247548 - sysutils/beats7 fails testport
Summary: sysutils/beats7 fails testport
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Greg Lewis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-06-25 20:33 UTC by Dan Langille
Modified: 2020-06-26 13:21 UTC (History)
2 users (show)

See Also:
juraj: maintainer-feedback+


Attachments
Fix pkg-plist (801 bytes, patch)
2020-06-25 20:33 UTC, Dan Langille
no flags Details | Diff
fix pkg-plist for stage-qa (1.01 KB, patch)
2020-06-25 21:03 UTC, Juraj Lutter
no flags Details | Diff
reference files without @sample (2.82 KB, patch)
2020-06-25 21:29 UTC, Juraj Lutter
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dan Langille freebsd_committer 2020-06-25 20:33:55 UTC
Created attachment 215945 [details]
Fix pkg-plist

From head:

====> Running Q/A tests (stage-qa)
Warning: Ignoring depends_blacklist QA test
Warning: You have disabled the licenses framework with DISABLE_LICENSES, unable to run checks
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: @dir %%DATADIR%%/metricbeat/module/ceph/mgr
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: %%ETCDIR%%/filebeat.yml.reference
Error: Missing: %%ETCDIR%%/filebeat.yml.sample
===> Error: Plist issues found.
*** Error code 1


Patch attached. May not be sorted appropriately.
Comment 1 Juraj Lutter 2020-06-25 21:03:47 UTC
Created attachment 215946 [details]
fix pkg-plist for stage-qa
Comment 2 Juraj Lutter 2020-06-25 21:04:37 UTC
WIth pkg-plist fixed, stage-qa results are:

root@dev12:/usr/ports/sysutils/beats7 # env DEVELOPER=yes make stage-qa
====> Running Q/A tests (stage-qa)
root@dev12:/usr/ports/sysutils/beats7 #
Comment 3 Dan Langille freebsd_committer 2020-06-25 21:09:15 UTC
There may also be an issue with using @sample in pkg-plist.

$ grep sample pkg-plist | sort
%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/audit.rules.d/sample-rules-linux-32bit.conf
%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/audit.rules.d/sample-rules-linux-64bit.conf
%%AUDITBEAT%%@sample %%ETCDIR%%/auditbeat.yml.reference
%%AUDITBEAT%%@sample %%ETCDIR%%/auditbeat.yml.sample
%%FILEBEAT%%@sample %%ETCDIR%%/filebeat.yml.reference
%%FILEBEAT%%@sample %%ETCDIR%%/filebeat.yml.sample
%%HEARTBEAT%%@sample %%ETCDIR%%/heartbeat.yml.reference
%%HEARTBEAT%%@sample %%ETCDIR%%/heartbeat.yml.sample
%%METRICBEAT%%@sample %%ETCDIR%%/metricbeat.yml.reference
%%METRICBEAT%%@sample %%ETCDIR%%/metricbeat.yml.sample
%%PACKETBEAT%%@sample %%ETCDIR%%/packetbeat.yml.reference
%%PACKETBEAT%%@sample %%ETCDIR%%/packetbeat.yml.sample

This is what gets installed via testport -i 

root@121R-dvl:/usr/local/etc/beats # ls -l
total 306
drwxr-xr-x  2 root  wheel     21 Jun 25 21:05 filebeat.modules.d
-rw-r--r--  1 root  wheel   8335 Jun 25 21:04 filebeat.yml
-rw-r--r--  1 root  wheel  75210 Jun 25 21:04 filebeat.yml.reference
-rw-r--r--  1 root  wheel   8335 Jun 25 21:04 filebeat.yml.sample
-rw-r--r--  1 root  wheel   6092 Jun 25 21:04 heartbeat.yml
-rw-r--r--  1 root  wheel  56073 Jun 25 21:04 heartbeat.yml.reference
-rw-r--r--  1 root  wheel   6092 Jun 25 21:04 heartbeat.yml.sample
drwxr-xr-x  2 root  wheel     46 Jun 25 21:05 metricbeat.modules.d
-rw-r--r--  1 root  wheel   6276 Jun 25 21:04 metricbeat.yml
-rw-r--r--  1 root  wheel  73083 Jun 25 21:04 metricbeat.yml.reference
-rw-r--r--  1 root  wheel   6276 Jun 25 21:04 metricbeat.yml.sample
Comment 4 Juraj Lutter 2020-06-25 21:29:06 UTC
Created attachment 215947 [details]
reference files without @sample
Comment 5 commit-hook freebsd_committer 2020-06-26 05:38:05 UTC
A commit references this bug:

Author: glewis
Date: Fri Jun 26 05:37:15 UTC 2020
New revision: 540421
URL: https://svnweb.freebsd.org/changeset/ports/540421

Log:
  Fix packing list

  PR:		247548
  Submitted by:	Juraj Lutter <juraj@lutter.sk>

Changes:
  head/sysutils/beats7/pkg-plist
Comment 6 Greg Lewis freebsd_committer 2020-06-26 05:38:25 UTC
Committed, thanks!
Comment 7 Dan Langille freebsd_committer 2020-06-26 13:21:20 UTC
Thank you.