diff --git a/common-dev-assets b/common-dev-assets index 9abb2581..325cfd0d 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 9abb2581610844f40aeb4f8a8b7f24e5a127d45b +Subproject commit 325cfd0d91902e08079644092bbf298c4872f388 diff --git a/tests/pr_test.go b/tests/pr_test.go index 486c81b2..0a4ae415 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -249,18 +249,8 @@ func TestRunQuickstartUpgradeSchematics(t *testing.T) { } } -/* -Below test is skipped because of 2 issues. -1. Config status changes to failed without any errors in projects and our pipeline fails. - Issue: https://github.ibm.com/epx/projects/issues/4757 -2. Undeploy order is not considered for nested dependencies such as Event notification and key protect - which causes undeploy of key protect to fail as keys created by EN are not yet deleted - Issue: https://github.ibm.com/epx/projects/issues/4750 -*/ - func TestRoksAddonDefaultConfiguration(t *testing.T) { t.Parallel() - t.Skip("Skipping this test as there are known issues in projects") options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{ Testing: t, @@ -271,7 +261,7 @@ func TestRoksAddonDefaultConfiguration(t *testing.T) { options.AddonConfig = cloudinfo.NewAddonConfigTerraform( options.Prefix, - "deploy-arch-ibm-ocp-vpc", + "deploy-arch-ibm-slz-ocp", "fully-configurable", map[string]interface{}{ "prefix": options.Prefix, @@ -286,11 +276,9 @@ func TestRoksAddonDefaultConfiguration(t *testing.T) { is not considered by projects as EN is not a direct dependency of OCP DA. So undeploy fails, because key protect instance can't be deleted because of active keys created by EN. Hence for now, we don't want to deploy EN so SM is being disabled. - Issue has been created for projects team. https://github.ibm.com/epx/projects/issues/4750 Once that is fixed, we can remove the logic to disable SM */ - options.AddonConfig.Dependencies = []cloudinfo.AddonConfig{ { OfferingName: "deploy-arch-ibm-secrets-manager", @@ -313,7 +301,7 @@ func TestRoksDependencyPermutations(t *testing.T) { Testing: t, Prefix: "ocp-per", AddonConfig: cloudinfo.AddonConfig{ - OfferingName: "deploy-arch-ibm-ocp-vpc", + OfferingName: "deploy-arch-ibm-slz-ocp", OfferingFlavor: "fully-configurable", Inputs: map[string]interface{}{ "prefix": "ocp-per",