diff --git a/src/test/e2e/52_oci_compose_differential_test.go b/src/test/e2e/52_oci_compose_differential_test.go index 5404fed7e5..fa3d116c23 100644 --- a/src/test/e2e/52_oci_compose_differential_test.go +++ b/src/test/e2e/52_oci_compose_differential_test.go @@ -11,7 +11,6 @@ import ( "testing" "github.com/defenseunicorns/zarf/src/pkg/utils" - "github.com/defenseunicorns/zarf/src/pkg/utils/exec" "github.com/defenseunicorns/zarf/src/types" "github.com/mholt/archiver/v3" "github.com/stretchr/testify/require" @@ -31,7 +30,7 @@ var ( differentialPackageName = "" normalPackageName = "" examplePackagePath = filepath.Join("examples", "helm-charts") - anotherPackagePath = filepath.Join("src", "test", "packages", "52-oci-differential") + anotherPackagePath = filepath.Join("src", "test", "packages", "52-differential") ) func (suite *OCIDifferentialSuite) SetupSuite() { @@ -46,8 +45,7 @@ func (suite *OCIDifferentialSuite) SetupSuite() { } func (suite *OCIDifferentialSuite) TearDownSuite() { - _, _, err := exec.Cmd("docker", "rm", "-f", "registry") - suite.NoError(err) + e2e.TeardownRegistry(suite.T(), 555) } func (suite *OCIDifferentialSuite) Test_0_Create_Differential_OCI() { diff --git a/src/test/packages/52-oci-differential/zarf.yaml b/src/test/packages/52-differential/zarf.yaml similarity index 77% rename from src/test/packages/52-oci-differential/zarf.yaml rename to src/test/packages/52-differential/zarf.yaml index 75e194f5e6..ad44bf3f58 100644 --- a/src/test/packages/52-oci-differential/zarf.yaml +++ b/src/test/packages/52-differential/zarf.yaml @@ -5,11 +5,6 @@ metadata: version: "###ZARF_PKG_TMPL_PACKAGE_VERSION###" components: - - name: demo-helm-oci-chart - required: true - import: - url: oci://127.0.0.1:555/helm-charts:0.0.1-skeleton - - name: versioned-assets import: path: ../../packages/08-differential-package diff --git a/src/test/packages/52-oci-differential/README.md b/src/test/packages/52-oci-differential/README.md deleted file mode 100644 index 0da88acc22..0000000000 --- a/src/test/packages/52-oci-differential/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# OCI Differential - -This test package is used to test the functionality of creating a Zarf Package while using the `--differential` flag where one of the components in the package we're creating is a component that has been imported from an OCI registry. - -This test package demonstrates that OCI imported components will not be included during differential package creation and that the proper build metadata will be added to the finalized package to ensure users of the package know which OCI imported components were not included. - -This test also includes components for more standard differential package creation to make sure all of that expected functionality remains the same when there are also OCI imported components in the package.