Migrate sub directory to fluent-package

[kenhys]

NOTE:

• package name (td-agent) is not changed yet
  * PACKAGE and ALL_PACKAGE use fluent-package in Rakefile,
  but it is just used to change sub directory.
• internal path of /opt/td-agent is not changed yet

So it keeps compatibility.

[ashie]

I expect to pass CI in this PR.

Could you rename also directory names in Rakefile and .github/workflows/?

fluent-package-builder/Rakefile

Lines 18 to 29 in 15f3ab2

	PACKAGES = [
	"td-agent",
	]
	APT_SOURCE_PACKAGES = [
	"fluentd-apt-source"
	]
	ALL_PACKAGE = [
	"td-agent",
	"fluentd-apt-source",
	]

fluent-package-builder/.github/workflows/apt.yml

Line 42 in 15f3ab2

path: td-agent/apt/repositories

Probably they aren't affect to built package names, so that tests will pass by only fixing them.
(AFAIK the code under td-agent directory isn't aware sub directory name.)

[kenhys]

TODO: fix test case

[cosmo0920]

One thing is existing that I've been wondering for.
Should we add a conflicts or replacing definition for rpm/deb package rules?
If we could handle this idea, we should provide such upgrading option to proceed seemless upgrade from old version of td-agent. Or, the future versions provide just breaking changes including package name changing and bumping up of major version?

[kenhys]

Should we add a conflicts or replacing definition for rpm/deb package rules?

Yes, it should be done. but all of such changes in a single PR are not appropriate (it makes it hard to review, and so on), so they will be solved in another PR.

This PR focus on a small task on purpose.

[kenhys]

Even though many timeouts occurs, now CI has passed.

[ashie]

I prefer getting source directory by __dir__ instead of defining PACKAGE_DIR.

[kenhys]

I prefer getting source directory by dir instead of defining PACKAGE_DIR.

okay, I'll try to fix it. Thanks.

[kenhys]

With checking local build, there is no difference like this:
(diff with current master and PR 448)

+ rm -f tdagent5deb.orig tdagent5rpm.orig tdagent5deb.rev tdagent5rpm.rev
+ debdiff
+ SRC=fluent-package-builder.master/td-agent/apt/repositories/debian/pool/bullseye/main/t/td-agent/td-agent_5.0.0-1_amd64.deb
+ DEST=fluent-package-builder.work/fluent-package/apt/repositories/debian/pool/bullseye/main/t/td-agent/td-agent_5.0.0-1_amd64.deb
+ dpkg-deb -c fluent-package-builder.master/td-agent/apt/repositories/debian/pool/bullseye/main/t/td-agent/td-agent_5.0.0-1_amd64.deb
+ gawk '{print $6}'
+ sort
+ dpkg-deb -c fluent-package-builder.work/fluent-package/apt/repositories/debian/pool/bullseye/main/t/td-agent/td-agent_5.0.0-1_amd64.deb
+ gawk '{print $6}'
+ sort
+ diff -u tdagent5deb.orig tdagent5deb.rev
+ rpmdiff
+ SRC=fluent-package-builder.master/td-agent/yum/repositories/centos/7/x86_64/Packages/td-agent-5.0.0-1.el7.x86_64.rpm
+ DEST=fluent-package-builder.work/fluent-package/yum/repositories/centos/7/x86_64/Packages/td-agent-5.0.0-1.el7.x86_64.rpm
+ rpm -qpl fluent-package-builder.master/td-agent/yum/repositories/centos/7/x86_64/Packages/td-agent-5.0.0-1.el7.x86_64.rpm
+ grep -v build-id
+ sort
+ rpm -qpl fluent-package-builder.work/fluent-package/yum/repositories/centos/7/x86_64/Packages/td-agent-5.0.0-1.el7.x86_64.rpm
+ grep -v build-id
+ sort
+ diff -u tdagent5rpm.orig tdagent5rpm.rev

[kenhys]

All checks have passed again.

[ashie]

LGTM

[ashie]

@kenhys Could you revise the first comment to reflect the current status? (Since we migrated merge style to Squash and merge, the first comment will be used as the commit message.)

[kenhys]

@ashie

Update the commit message, is it reasonable?

[ashie]

Please revise also the title & first comment of this PR.

[kenhys]

Fixed now.

[ashie]

Thanks!

[kenhys]

Thanks!