Skip to content

Commit ce77d51

Browse files
authored
tests: enable addon tests (#788)
1 parent 53b49ea commit ce77d51

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

tests/pr_test.go

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -249,18 +249,8 @@ func TestRunQuickstartUpgradeSchematics(t *testing.T) {
249249
}
250250
}
251251

252-
/*
253-
Below test is skipped because of 2 issues.
254-
1. Config status changes to failed without any errors in projects and our pipeline fails.
255-
Issue: https://github.ibm.com/epx/projects/issues/4757
256-
2. Undeploy order is not considered for nested dependencies such as Event notification and key protect
257-
which causes undeploy of key protect to fail as keys created by EN are not yet deleted
258-
Issue: https://github.ibm.com/epx/projects/issues/4750
259-
*/
260-
261252
func TestRoksAddonDefaultConfiguration(t *testing.T) {
262253
t.Parallel()
263-
t.Skip("Skipping this test as there are known issues in projects")
264254

265255
options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
266256
Testing: t,
@@ -271,7 +261,7 @@ func TestRoksAddonDefaultConfiguration(t *testing.T) {
271261

272262
options.AddonConfig = cloudinfo.NewAddonConfigTerraform(
273263
options.Prefix,
274-
"deploy-arch-ibm-ocp-vpc",
264+
"deploy-arch-ibm-slz-ocp",
275265
"fully-configurable",
276266
map[string]interface{}{
277267
"prefix": options.Prefix,
@@ -286,11 +276,9 @@ func TestRoksAddonDefaultConfiguration(t *testing.T) {
286276
is not considered by projects as EN is not a direct dependency of OCP DA. So undeploy fails, because
287277
key protect instance can't be deleted because of active keys created by EN. Hence for now, we don't want to deploy
288278
EN so SM is being disabled.
289-
290279
Issue has been created for projects team. https://github.ibm.com/epx/projects/issues/4750
291280
Once that is fixed, we can remove the logic to disable SM
292281
*/
293-
294282
options.AddonConfig.Dependencies = []cloudinfo.AddonConfig{
295283
{
296284
OfferingName: "deploy-arch-ibm-secrets-manager",
@@ -313,7 +301,7 @@ func TestRoksDependencyPermutations(t *testing.T) {
313301
Testing: t,
314302
Prefix: "ocp-per",
315303
AddonConfig: cloudinfo.AddonConfig{
316-
OfferingName: "deploy-arch-ibm-ocp-vpc",
304+
OfferingName: "deploy-arch-ibm-slz-ocp",
317305
OfferingFlavor: "fully-configurable",
318306
Inputs: map[string]interface{}{
319307
"prefix": "ocp-per",

0 commit comments

Comments
 (0)