matrix: tag containers w/ arch, and include security

problem: the containers were being built and tagged inconsistently, we
used to only build multi-arch for bookworm, so only that one needed the
explicit tag, now all the multi-arch ones do. We are also inconsistent
about the inclusion of caliper and flux-security

solution: add the platform key to all the multi-arch tagging containers,
and ensure they all build with flux-security and caliper to match the
arm64 containers

Author: trws

src/test/generate-matrix.py

@@ -163,8 +163,17 @@ def __str__(self):
             platform="linux/arm64",
             docker_tag=True,
             command_args="--install-only ",
+            args=(
+                "--prefix=/usr"
+                " --sysconfdir=/etc"
+                " --with-systemdsystemunitdir=/etc/systemd/system"
+                " --localstatedir=/var"
+                " --with-flux-security"
+            ),
         )
 
+# builds to match arm64 images must have linux/amd64 platform explicitly
+
 # Debian: gcc-12, content-s3, distcheck
 matrix.add_build(
     name="bookworm - gcc-12,content-s3,distcheck",
@@ -201,6 +210,7 @@ def __str__(self):
     args="--with-flux-security --enable-caliper",
 )
 
+
 # Ubuntu: TEST_INSTALL
 matrix.add_build(
     name="noble - test-install",
@@ -244,6 +254,7 @@ def __str__(self):
         TEST_INSTALL="t",
     ),
     platform="linux/amd64",
+    args="--with-flux-security --enable-caliper",
     docker_tag=True,
 )
 
@@ -255,18 +266,11 @@ def __str__(self):
     docker_tag=True,
 )
 
-# RHEL8 clone
-matrix.add_build(
-    name="el8",
-    image="el8",
-    env=dict(PYTHON_VERSION="3.6", LDFLAGS="-Wl,-z,relro  -Wl,-z,now"),
-    docker_tag=True,
-)
-
 # RHEL8 clone
 matrix.add_build(
     name="el8 - ascii",
     image="el8",
+    env=dict(PYTHON_VERSION="3.6", LDFLAGS="-Wl,-z,relro  -Wl,-z,now"),
     args="--enable-broken-locale-mode",
 )
 
@@ -293,6 +297,7 @@ def __str__(self):
         " --with-flux-security"
         " --enable-caliper"
     ),
+    platform="linux/amd64",
     docker_tag=True,
 )