rpm: install all target packages in containers

Restore default containers to install every generated binary RPM and keep supplemental package integration coverage with the RPM implementation.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Author: cpuguy83

targets/linux/rpm/distro/container.go

@@ -46,14 +46,8 @@ func (cfg *Config) BuildContainer(ctx context.Context, client gwclient.Client, s
 
 	baseMountPath := rpmMountDir + "-base"
 	basePkgs := llb.Scratch().File(llb.Mkdir("/RPMS", 0o755), opts...)
-	revision := spec.Revision
-	if revision == "" {
-		revision = "1"
-	}
-	// Anchor the glob on the primary package's NVR so supplemental RPMs built
-	// into the same output tree are not installed by the default container target.
 	pkgs := []string{
-		filepath.Join(rpmMountDir, "*", spec.Name+"-"+spec.Version+"-"+revision+".*.rpm"),
+		filepath.Join(rpmMountDir, "*/*.rpm"),
 	}
 
 	if !skipBase && len(cfg.BasePackages) > 0 {

targets/linux/rpm/distro/container_test.go

@@ -10,85 +10,74 @@ import (
 	"gotest.tools/v3/assert"
 )
 
-func TestBuildContainerInstallsOnlyThePrimaryRPM(t *testing.T) {
+func TestBuildContainerInstallsAllGeneratedBinaryRPMs(t *testing.T) {
 	t.Parallel()
 
 	cases := []struct {
-		name            string
-		packageName     string
-		version         string
-		revision        string
-		archDir         string
-		primaryRPM      string
-		supplementalRPM string
+		name    string
+		archDir string
+		rpm     string
 	}{
 		{
-			name:            "versions beginning with a digit",
-			packageName:     "myapp",
-			version:         "1.0.0",
-			revision:        "1",
-			archDir:         "x86_64",
-			primaryRPM:      "myapp-1.0.0-1.azl3.x86_64.rpm",
-			supplementalRPM: "myapp-debug-1.0.0-1.azl3.x86_64.rpm",
+			name:    "the primary package is selected",
+			archDir: "x86_64",
+			rpm:     "myapp-1.0.0-1.azl3.x86_64.rpm",
 		},
 		{
-			name:            "versions beginning with a letter",
-			packageName:     "myapp",
-			version:         "v1.0",
-			revision:        "2",
-			archDir:         "x86_64",
-			primaryRPM:      "myapp-v1.0-2.x86_64.rpm",
-			supplementalRPM: "myapp-docs-v1.0-2.x86_64.rpm",
+			name:    "a default supplemental package is selected",
+			archDir: "x86_64",
+			rpm:     "myapp-contrib-1.0.0-1.azl3.x86_64.rpm",
 		},
 		{
-			name:            "architecture-independent packages",
-			packageName:     "my-complex-app",
-			version:         "1.0~beta1",
-			revision:        "42",
-			archDir:         "noarch",
-			primaryRPM:      "my-complex-app-1.0~beta1-42.azl3.noarch.rpm",
-			supplementalRPM: "my-complex-app-compat-1.0~beta1-42.azl3.noarch.rpm",
+			name:    "a custom-named supplemental package is selected",
+			archDir: "x86_64",
+			rpm:     "my-custom-pkg-1.0.0-1.azl3.x86_64.rpm",
+		},
+		{
+			name:    "a documentation package is selected",
+			archDir: "noarch",
+			rpm:     "myapp-docs-1.0.0-1.azl3.noarch.rpm",
+		},
+		{
+			name:    "a debug package is selected",
+			archDir: "x86_64",
+			rpm:     "myapp-debuginfo-1.0.0-1.azl3.x86_64.rpm",
+		},
+		{
+			name:    "a compatibility package is selected",
+			archDir: "aarch64",
+			rpm:     "myapp-compat-1.0.0-1.azl3.aarch64.rpm",
+		},
+	}
+
+	var installed []string
+	cfg := &Config{
+		ContextRef: "worker",
+		InstallFunc: func(_ *dnfInstallConfig, _ string, pkgs []string) llb.RunOption {
+			installed = append(installed, pkgs...)
+			return llb.Args([]string{"true"})
 		},
 	}
+	sOpt := dalec.SourceOpts{
+		GetContext: func(string, ...llb.LocalOption) (*llb.State, error) {
+			st := llb.Scratch()
+			return &st, nil
+		},
+	}
+
+	cfg.BuildContainer(t.Context(), &containerTestClient{}, sOpt, &dalec.Spec{}, "target", llb.Scratch())
+
+	assert.Assert(t, len(installed) == 1)
+	assert.Equal(t, installed[0], filepath.Join("/tmp/rpms", "*/*.rpm"))
 
 	for _, tc := range cases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			var installed []string
-			cfg := &Config{
-				ContextRef: "worker",
-				InstallFunc: func(_ *dnfInstallConfig, _ string, pkgs []string) llb.RunOption {
-					installed = append(installed, pkgs...)
-					return llb.Args([]string{"true"})
-				},
-			}
-			sOpt := dalec.SourceOpts{
-				GetContext: func(string, ...llb.LocalOption) (*llb.State, error) {
-					st := llb.Scratch()
-					return &st, nil
-				},
-			}
-			spec := &dalec.Spec{
-				Name:     tc.packageName,
-				Version:  tc.version,
-				Revision: tc.revision,
-			}
-
-			cfg.BuildContainer(t.Context(), &containerTestClient{}, sOpt, spec, "target", llb.Scratch())
-
-			assert.Assert(t, len(installed) == 1)
-			wantPattern := filepath.Join("/tmp/rpms", "*", tc.packageName+"-"+tc.version+"-"+tc.revision+".*.rpm")
-			assert.Equal(t, installed[0], wantPattern)
-
-			primaryMatches, err := filepath.Match(installed[0], filepath.Join("/tmp/rpms", tc.archDir, tc.primaryRPM))
-			assert.NilError(t, err)
-			assert.Assert(t, primaryMatches, "pattern %q should select primary RPM %q", installed[0], tc.primaryRPM)
-
-			supplementalMatches, err := filepath.Match(installed[0], filepath.Join("/tmp/rpms", tc.archDir, tc.supplementalRPM))
+			matches, err := filepath.Match(installed[0], filepath.Join("/tmp/rpms", tc.archDir, tc.rpm))
 			assert.NilError(t, err)
-			assert.Assert(t, !supplementalMatches, "pattern %q should exclude supplemental RPM %q", installed[0], tc.supplementalRPM)
+			assert.Assert(t, matches, "pattern %q should select RPM %q", installed[0], tc.rpm)
 		})
 	}
 }

test/linux_target_test.go

@@ -77,6 +77,8 @@ type targetConfig struct {
 	// Sysext is the target for creating a systemd system extension.
 	Sysext string
 
+	Subpackages *subpackageTestConfig
+
 	// FormatDepEqual, when set, alters the provided dependency version to match
 	// what is necessary for the target distro to set a dependency for an equals
 	// operator.
@@ -3864,6 +3866,14 @@ func Value() string {
 		ctx := startTestSpan(baseCtx, t)
 		testArtifactCapabilities(ctx, t, testConfig)
 	})
+
+	if testConfig.Target.Subpackages != nil {
+		t.Run("subpackages", func(t *testing.T) {
+			t.Parallel()
+			ctx := startTestSpan(baseCtx, t)
+			testSubpackages(ctx, t, testConfig.Target, testConfig.Target.Subpackages)
+		})
+	}
 }
 
 func testNodeNpmGenerator(ctx context.Context, t *testing.T, targetCfg targetConfig, opts ...srOpt) {