Merge ~lucaskanashiro/ubuntu/+source/fence-agents:merge-experimental-mantic into ubuntu/+source/fence-agents:debian/experimental

[Lucas Kanashiro]

Merge version 4.12.1-2~exp1 from Debian experimental. This version contains the split of the agents, now each one can be separately installed by its own binary package. The delta was considerably reduced.

PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ha-stack/+packages

autopkgtest summary:

* Results:
  - fence-agents/4.12.1-2~exp1ubuntu1~ppa2
    + ✅ fence-agents on mantic for amd64 @ 06.07.23 22:22:13 Log️ 🗒️
    + ✅ fence-agents on mantic for arm64 @ 06.07.23 22:35:36 Log️ 🗒️
    + ✅ fence-agents on mantic for armhf @ 06.07.23 22:15:40 Log️ 🗒️
    + ✅ fence-agents on mantic for ppc64el @ 06.07.23 22:09:24 Log️ 🗒️
    + ✅ fence-agents on mantic for s390x @ 06.07.23 22:38:35 Log️ 🗒️

[Athos Ribeiro (athos-ribeiro)]

Thanks Lucas, I am reviewing this one :)

[Athos Ribeiro (athos-ribeiro)]

Nice work, Lucas!

The extra package description was updated to say that

+ This package is a metapackage depending on all available fence agents which
+ are not curated by the Ubuntu Server team.

I suppose the base package should also contain a similar description?

Also, are there any plans to drop these transitional packages now that we have one package per agent?

Finally, where does the definition of a "curated" agent lies?

As a user, it would be nice to understand what is special about the curated agents. Maybe the package descriptions should also include such definitions (or point to it).

review: Needs Information

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Athos!

The -base package also contains a similar statement:

"This package contains the Fence Agents that are curated by the Ubuntu
 Server team."

I did not think about the removal of the transitional package yet, but I think we should do it at some point before the next LTS release, since we already released Jammy with this transitional package.

The difference of the curated agents is described in the server guide:

https://ubuntu.com/server/docs/ubuntu-ha-pacemaker-fence-agents

But in short, a curated agent has automated tests in place and is supported in main because of that. Should we mention that in the package description?

[Athos Ribeiro (athos-ribeiro)]

Thanks, Lucas!

> The -base package also contains a similar statement:

> "This package contains the Fence Agents that are curated by the Ubuntu
 Server team."

This is different from mentioning that the package is actually a metapackage which depends on all fence agents which are curated, as the -extra counterpart does. Should the -base package mention it as well?

> I did not think about the removal of the transitional package yet, but I think we should do it at some point before the next LTS release, since we already released Jammy with this transitional package.

ack, I think we can defer this discussion for after this merge then :)

> But in short, a curated agent has automated tests in place and is supported in main because of that. Should we mention that in the package description?

I believe it should, but I believe this can also be deferred to a discussion outside of the scope of this merge, WDYT?

[Lucas Kanashiro (lucaskanashiro)]

I tried to improve the packages' description to cover your comments. WDYT?

Yeah, the other topics I think we can discuss later, after this merge.

[Athos Ribeiro (athos-ribeiro)]

LGTM

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks Athos! Package uploaded:

Uploading fence-agents_4.12.1-2~exp1ubuntu1.dsc
Uploading fence-agents_4.12.1.orig.tar.gz
Uploading fence-agents_4.12.1-2~exp1ubuntu1.debian.tar.xz
Uploading fence-agents_4.12.1-2~exp1ubuntu1_source.buildinfo
Uploading fence-agents_4.12.1-2~exp1ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index da902da..c3fb229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+fence-agents (4.12.1-2~exp1ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian experimental (LP: #2018071). Remaining changes:
+    - d/t/delay: Reduce minimum delay when running on ppc64el.
+    - Create the fence-agents-base binary package.
+      This is a metapackage to install all the agents curated by the
+      Ubuntu Server team.
+    - Rename fence-agents with non-curated agents to fence-agents-extra.
+      This is a metapackage to install all the agents non-curated by the
+      Ubuntu Server team.
+    - Create a transitional binary package called fence-agents.
+      It depends on both fence-agents-{base,extra}.
+  * Dropped:
+    - d/rules: install files in debian/fence-agents instead of debian/tmp.
+    - Create the fence-agents-common binary package with files to be
+      shared by agents.
+    - Update the way agents description are added to the package
+      description to support the split.
+    - d/curated-agents: add set of curated agents to the -base package.
+      They are: fence_scsi, fence_mpath, fence_sbd, fence_ipmilan and
+      friends (fence_idrac, fence_ilo3, fence_ilo4, fence_ilo5, fence_imm,
+      and fence_ipmilanplus).
+    - d/control: suggest dependecies of agents in the -base package
+      (LP #1863677).
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 06 Jul 2023 17:56:39 -0300
+
 fence-agents (4.12.1-2~exp1) experimental; urgency=medium
 
   [ Lucas Kanashiro ]
@@ -48,6 +75,36 @@ fence-agents (4.12.1-2~exp1) experimental; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Sun, 02 Jul 2023 16:46:59 +0200
 
+fence-agents (4.12.1-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993400). Remaining changes:
+    - d/t/delay: Reduce minimum delay when running on ppc64el.
+    - d/rules: install files in debian/fence-agents instead of debian/tmp.
+    - Create the fence-agents-common binary package with files to be
+      shared by agents.
+    - Create the fence-agents-base binary package.
+      To add a new curated agent it should be added to debian/curated-agents
+      file in a new line.
+    - Update the way agents description are added to the package
+      description to support the split.
+    - Rename fence-agents with non-curated agents to fence-agents-extra.
+      Also fix installation of fence-virt{,d} binary packages.
+    - Create a transitional binary package called fence-agents.
+      It depends on both fence-agents-{base,extra}.
+    - d/curated-agents: add set of curated agents to the -base package.
+      They are: fence_scsi, fence_mpath, fence_sbd, fence_ipmilan and
+      friends (fence_idrac, fence_ilo3, fence_ilo4, fence_ilo5, fence_imm,
+      and fence_ipmilanplus).
+    - d/control: suggest dependecies of agents in the -base package
+      (LP #1863677).
+  * Dropped:
+    - d/rules: disable -Wstringop-truncation in s390x to fix a FTBFS.
+      [applied by Debian version 4.12.0-1]
+    - d/rules: do not install /var/run directory anymore.
+      [Not needed anymore]
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 30 Jan 2023 17:31:30 -0300
+
 fence-agents (4.12.1-1) unstable; urgency=medium
 
   * New upstream version 4.12.1 (Closes: #1029768)
@@ -72,6 +129,46 @@ fence-agents (4.12.0-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Sat, 14 Jan 2023 15:44:02 +0100
 
+fence-agents (4.11.0-1ubuntu2) kinetic; urgency=medium
+
+  * d/rules: disable -Wstringop-truncation in s390x to fix a FTBFS.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 15 Aug 2022 17:31:50 -0300
+
+fence-agents (4.11.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971275). Remaining changes:
+    - d/t/delay: Reduce minimum delay when running on ppc64el.
+    - d/rules: install files in debian/fence-agents instead of debian/tmp.
+    - Create the fence-agents-common binary package with files to be
+      shared by agents.
+    - Create the fence-agents-base binary package.
+      To add a new curated agent it should be added to debian/curated-agents
+      file in a new line.
+    - Update the way agents description are added to the package
+      description to support the split.
+    - Rename fence-agents with non-curated agents to fence-agents-extra.
+    - Create a transitional binary package called fence-agents.
+      It depends on both fence-agents-{base,extra}.
+    - d/control: Add missing Breaks/Replaces to the fence-agents-base.
+    - d/curated-agents: add fence_scsi to the -base package.
+    - d/curated-agents: add fence_mpath to the -base package.
+    - d/rules: do not install /var/run directory anymore.
+      This was causing a lintian error because of the /var/run/cluster
+      directory created by the upstream build system. The needed files in
+      /var/run should be created by the agents during runtime.
+    - d/curated-agents: add fence_ipmilan and fence_sbd to the -base
+      package (LP #1965312).
+      Also add the following agents which are symlinks to fence_ipmilan:
+      fence_idrac, fence_ilo3, fence_ilo4, fence_ilo5, fence_imm, and
+      fence_ipmilanplus.
+    - d/control: suggest dependecies of agents in the -base package
+      (LP #1863677).
+  * Added:
+    - Fix installation of fence-virt{,d} binary packages.
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 05 Aug 2022 14:48:47 -0300
+
 fence-agents (4.11.0-1) unstable; urgency=medium
 
   * New upstream version 4.11.0
@@ -87,6 +184,111 @@ fence-agents (4.11.0-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Sun, 01 May 2022 17:51:59 +0200
 
+fence-agents (4.7.1-1ubuntu8) jammy; urgency=medium
+
+  * d/curated-agents: add fence_ipmilan and fence_sbd to the -base package.
+    Also add the following agents which are symlinks to fence_ipmilan:
+    fence_idrac, fence_ilo3, fence_ilo4, fence_ilo5, fence_imm, and
+    fence_ipmilanplus (LP: #1965312).
+  * d/control: suggest dependecies of agents in the -base package (LP: #1863677)
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 17 Mar 2022 11:43:13 -0300
+
+fence-agents (4.7.1-1ubuntu7) impish; urgency=medium
+
+  * d/rules: do not install /var/run directory anymore.
+    This was causing a lintian error because of the /var/run/cluster
+    directory created by the upstream build system. The needed files in
+    /var/run should be created by the agents during runtime.
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 28 Sep 2021 09:16:11 -0300
+
+fence-agents (4.7.1-1ubuntu6) impish; urgency=medium
+
+  * d/curated-agents: add fence_mpath to the -base package (LP: #1942368).
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 20 Jul 2021 10:53:33 -0300
+
+fence-agents (4.7.1-1ubuntu5) impish; urgency=medium
+
+  * d/curated-agents: add fence_scsi to the -base package.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 30 Jun 2021 16:54:03 -0300
+
+fence-agents (4.7.1-1ubuntu4) impish; urgency=medium
+
+  * Rename fence-agents with non-curated agents to fence-agents-extra.
+    - d/control: rename the fence-agents binary package to fence-agents-extra.
+    - d/extract-agents-description:
+      + Rename the package name used in the substvars filename.
+      + Rename all the occurrences of the 'unsupported' term to 'non-curated'.
+    - d/move-supported-agents: update the binary package name in the path used
+      to move files.
+    - d/rules:
+      + Rename FENCE_AGENTS_DIR to FENCE_AGENTS_EXTRA_DIR with the appropriate
+        path.
+      + Edit comments to avoid the term 'supported'.
+  * Rename fence-agent-supported with curated agents to fence-agents-base.
+    - d/control:
+      + Rename fence-agents-supported binary package to fence-agents-base.
+      + Update the short and long description to not use the 'supported' term.
+      + Rename the supportedAgents substvar to curatedAgents.
+    - d/curated-agents: new file, this is the renamed d/supported-agents file.
+    - d/extract-agents-description:
+      + Rename the package name used in the substvars filename.
+      + Rename all the occurrences of the 'supported' term to 'curated'.
+    - d/move-curated-agents: new file, this is the renamed
+      d/move-supported-agents script.
+    - d/rules:
+      + Call d/move-curated-agents instead of d/move-supported-agents.
+      + Edit comments to avoid the term 'supported'.
+  * Create a transitional binary package called fence-agents.
+    - d/control: add a new section for the transitional package, adding
+      fence-agents-{base,extra} as dependencies.
+  * d/control: add a missing Breaks/Replaces relation to the fence-agents-base.
+  * d/move-curated-agents: use readonly variables to store the binary
+    packages' path.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 12 May 2021 15:44:43 -0300
+
+fence-agents (4.7.1-1ubuntu3) impish; urgency=medium
+
+  * d/control: make fence-agents recommend fence-agents-supported.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 03 May 2021 09:14:56 -0300
+
+fence-agents (4.7.1-1ubuntu2) impish; urgency=medium
+
+  * d/rules: install files in debian/fence-agents instead of debian/tmp.
+  * d/install: removed, it is not needed.
+  * Create the fence-agents-common binary package with files to be shared by
+    the supported and unsupported agents.
+    - d/control: add a new paragraph for the new binary package and move some
+      runtime dependencies from fence-agents to fence-agents-common.
+    - d/rules: move the common code to the new binary package.
+  * Create the fence-agents-supported package
+    - d/control: add a new paragraph for the new binary package.
+    - d/move-supported-agents: added a shell script to manage the move of all
+      supported agents to the right binary package.
+    - d/rules: call the d/move-supported-agents shell script and also run the
+      checks for the agents in the new binary package.
+    - d/supported-agents: added a file with a list of the supported agents.
+  * Update the way agent descriptions are added to the package description to
+    support the split.
+    - d/control: added a new variable to generate the list of supported agents
+      during build time and fix the indentation.
+    - d/extract-agents-description: added a shell script to generate a list of
+      supported and unsupported agents with their description.
+    - d/rules: call the d/extract-agents-description script in dh_gencontrol.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 12 Apr 2021 18:27:29 -0300
+
+fence-agents (4.7.1-1ubuntu1) hirsute; urgency=medium
+
+  * d/t/delay: Reduce minimum delay when running on ppc64el.
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 26 Feb 2021 16:46:48 -0500
+
 fence-agents (4.7.1-1) unstable; urgency=medium
 
   * New upstream version 4.7.1
diff --git a/debian/control b/debian/control
index 82bee8e..8efba80 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: fence-agents
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders: Adrian Vondendriesch <[e-mail]>,
            Valentin Vidic <[e-mail]>
 Build-Depends: autoconf,
@@ -42,85 +43,97 @@ Vcs-Git: https://salsa.debian.org/ha-team/fence-agents.git
 
 Package: fence-agents
 Architecture: all
+Section: oldlibs
 Depends: ${misc:Depends},
-Recommends: fence-agents-ack-manual,
-            fence-agents-aliyun,
-            fence-agents-alom,
-            fence-agents-amt,
-            fence-agents-apc,
-            fence-agents-apc-snmp,
-            fence-agents-aws,
-            fence-agents-azure-arm,
-            fence-agents-bladecenter,
-            fence-agents-brocade,
-            fence-agents-cdu,
-            fence-agents-cisco-mds,
-            fence-agents-cisco-ucs,
-            fence-agents-compute,
-            fence-agents-crosslink,
-            fence-agents-cyberpower-ssh,
-            fence-agents-docker,
-            fence-agents-drac,
-            fence-agents-drac5,
-            fence-agents-dummy,
-            fence-agents-eaton-snmp,
-            fence-agents-ecloud,
-            fence-agents-emerson,
-            fence-agents-eps,
-            fence-agents-gce,
-            fence-agents-hds-cb,
-            fence-agents-heuristics-ping,
-            fence-agents-hpblade,
-            fence-agents-ibmblade,
-            fence-agents-ibm-powervs,
-            fence-agents-ibm-vpc,
-            fence-agents-ibmz,
-            fence-agents-ifmib,
-            fence-agents-ilo2,
-            fence-agents-ilo-moonshot,
-            fence-agents-ilo-mp,
-            fence-agents-ilo-ssh,
-            fence-agents-intelmodular,
-            fence-agents-ipdu,
-            fence-agents-ipmilan,
-            fence-agents-ironic,
-            fence-agents-kdump,
-            fence-agents-kubevirt,
-            fence-agents-ldom,
-            fence-agents-lindy-pdu,
-            fence-agents-lpar,
-            fence-agents-mpath,
-            fence-agents-netio,
-            fence-agents-openstack,
-            fence-agents-ovh,
-            fence-agents-powerman,
-            fence-agents-pve,
-            fence-agents-raritan,
-            fence-agents-raritan-px3,
-            fence-agents-rcd-serial,
-            fence-agents-redfish,
-            fence-agents-rhevm,
-            fence-agents-rsa,
-            fence-agents-rsb,
-            fence-agents-sanbox2,
-            fence-agents-scsi,
-            fence-agents-skalar,
-            fence-agents-vbox,
-            fence-agents-virsh,
-            fence-agents-vmware,
-            fence-agents-vmware-rest,
-            fence-agents-vmware-soap,
-            fence-agents-vmware-vcloud,
-            fence-agents-wti,
-            fence-agents-xenapi,
-            fence-virt,
-Suggests: fence-agents-sbd
-Description: Fence Agents for Red Hat Cluster - all agents
- Red Hat Fence Agents is a collection of scripts to handle remote power
- management for several devices. They allow failed or unreachable nodes to be
- forcibly restarted and removed from the cluster.
- .
- This package is a metapackage depending on all available fence agents.
+         fence-agents-base (>= ${source:Version}),
+         fence-agents-extra (>= ${source:Version})
+Description: Transitional package for the fence-agents
+ Red Hat Fence Agents is a collection of scripts to handle remote
+ power management for several devices.  They allow failed or
+ unreachable nodes to be forcibly restarted and removed from the
+ cluster.
+ .
+ This is a transitional package which provides a set of curated
+ (fence-agents-base) and non-curated (fence-agents-extra) agents.
+
+Package: fence-agents-extra
+Architecture: all
+Depends: ${misc:Depends},
+         fence-agents-ack-manual,
+         fence-agents-aliyun,
+         fence-agents-alom,
+         fence-agents-amt,
+         fence-agents-apc,
+         fence-agents-apc-snmp,
+         fence-agents-aws,
+         fence-agents-azure-arm,
+         fence-agents-bladecenter,
+         fence-agents-brocade,
+         fence-agents-cdu,
+         fence-agents-cisco-mds,
+         fence-agents-cisco-ucs,
+         fence-agents-compute,
+         fence-agents-crosslink,
+         fence-agents-cyberpower-ssh,
+         fence-agents-docker,
+         fence-agents-drac,
+         fence-agents-drac5,
+         fence-agents-dummy,
+         fence-agents-eaton-snmp,
+         fence-agents-ecloud,
+         fence-agents-emerson,
+         fence-agents-eps,
+         fence-agents-gce,
+         fence-agents-hds-cb,
+         fence-agents-heuristics-ping,
+         fence-agents-hpblade,
+         fence-agents-ibmblade,
+         fence-agents-ibm-powervs,
+         fence-agents-ibm-vpc,
+         fence-agents-ibmz,
+         fence-agents-ifmib,
+         fence-agents-ilo2,
+         fence-agents-ilo-moonshot,
+         fence-agents-ilo-mp,
+         fence-agents-ilo-ssh,
+         fence-agents-intelmodular,
+         fence-agents-ipdu,
+         fence-agents-ironic,
+         fence-agents-kdump,
+         fence-agents-kubevirt,
+         fence-agents-ldom,
+         fence-agents-lindy-pdu,
+         fence-agents-lpar,
+         fence-agents-netio,
+         fence-agents-openstack,
+         fence-agents-ovh,
+         fence-agents-powerman,
+         fence-agents-pve,
+         fence-agents-raritan,
+         fence-agents-raritan-px3,
+         fence-agents-rcd-serial,
+         fence-agents-redfish,
+         fence-agents-rhevm,
+         fence-agents-rsa,
+         fence-agents-rsb,
+         fence-agents-sanbox2,
+         fence-agents-skalar,
+         fence-agents-vbox,
+         fence-agents-vmware,
+         fence-agents-vmware-rest,
+         fence-agents-vmware-soap,
+         fence-agents-vmware-vcloud,
+         fence-agents-wti,
+         fence-agents-xenapi,
+         fence-virt,
+Description: Fence Agents for Red Hat Cluster non-curated by Ubuntu
+ Red Hat Fence Agents is a collection of scripts to handle remote power
+ management for several devices. They allow failed or unreachable nodes to be
+ forcibly restarted and removed from the cluster.
+ .
+ This package is a metapackage depending on all available fence agents which
+ are not curated by the Ubuntu Server team. The agents which are not curated by
+ Ubuntu are not officially supported.
 
 Package: fence-agents-common
 Architecture: all
@@ -1481,3 +1494,23 @@ Description: Fence Agents for Red Hat Cluster - virt daemon
  .
  This package contains the fence_virtd daemon to be used on the
  physical host.
+
+Package: fence-agents-base
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends},
+         fence-agents-ipmilan (>= ${source:Version}),
+         fence-agents-mpath (>= ${source:Version}),
+         fence-agents-sbd (>= ${source:Version}),
+         fence-agents-scsi (>= ${source:Version}),
+         fence-agents-virsh (>= ${source:Version})
+Breaks: fence-agents (<< 4.7.1-1ubuntu2)
+Replaces: fence-agents (<< 4.7.1-1ubuntu2)
+Description: Fence Agents for Red Hat Cluster curated by Ubuntu
+ Red Hat Fence Agents is a collection of scripts to handle remote
+ power management for several devices.  They allow failed or
+ unreachable nodes to be forcibly restarted and removed from the
+ cluster.
+ .
+ This package is a metapackage depending on all available fence agents which
+ are curated by the Ubuntu Server team. Curated agents are tested and supported
+ by Ubuntu.
diff --git a/debian/tests/delay b/debian/tests/delay
index ad0af03..1ad534f 100755
--- a/debian/tests/delay
+++ b/debian/tests/delay
@@ -6,6 +6,12 @@ DEFAULT_ARGS='delay=10\n login=test\n passwd=test\n ipaddr=127.0.0.1\n port=1\n 
 OUTPUT=$AUTOPKGTEST_TMP/delay
 mkdir -p $OUTPUT
 
+if [ "$(dpkg --print-architecture)" = "ppc64el" ]; then
+    MIN_DELAY=500
+else
+    MIN_DELAY=1000
+fi
+
 for agent in /usr/sbin/fence_*; do
   [ "$agent" = "/usr/sbin/fence_ack_manual" ] && continue
   [ "$agent" = "/usr/sbin/fence_kdump" ] && continue
@@ -18,7 +24,7 @@ for agent in /usr/sbin/fence_*; do
 
   (
     TIME=$(/usr/bin/time -p sh -c "printf '$ARGS' | $agent " 2>&1 | awk -F"[. ]" -vOFS= '/real/ {print $2,$3}')
-    if [ "$TIME" -lt 1000 ]; then
+    if [ "$TIME" -lt "$MIN_DELAY" ]; then
       echo "$agent delay too low: $TIME" | tee $LOG
     else
       echo "$agent delay ok: $TIME" | tee $LOG