Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
e5e28c3
refactor: split observability
vkuma17 Aug 15, 2025
9d6bc51
fix
vkuma17 Aug 15, 2025
13c8242
added SCC wp dependency
vkuma17 Aug 19, 2025
8ad338d
modified diagram
vkuma17 Aug 26, 2025
7769e59
Merge branch 'main' into split-obs
vkuma17 Aug 27, 2025
be08b4e
Update ibm_catalog.json
vkuma17 Aug 27, 2025
153a1e1
modified diagram
vkuma17 Aug 27, 2025
fac2ee9
modified diagram
vkuma17 Aug 27, 2025
c6d9da9
Update deployable-architecture-ocp-cluster.svg
vkuma17 Aug 27, 2025
55a09f8
updated catalog json
vkuma17 Sep 2, 2025
5cabaf2
modified diagram
vkuma17 Sep 2, 2025
9fe45e1
modified diagram
vkuma17 Sep 2, 2025
a7b6051
modified diagram
vkuma17 Sep 2, 2025
1cc5ef4
Update deployable-architecture-ocp-cluster.svg
vkuma17 Sep 2, 2025
f18fd52
modified diagram
vkuma17 Sep 2, 2025
af4f7e5
modified diagram
vkuma17 Sep 2, 2025
ffe1465
Merge branch 'main' into split-obs
vkuma17 Sep 2, 2025
43f3e3c
fixed precommit error
vkuma17 Sep 2, 2025
4f73df2
Update ibm_catalog.json
vkuma17 Sep 3, 2025
9509f0d
Update pr_test.go
vkuma17 Sep 3, 2025
a9c470e
fixed precommit
vkuma17 Sep 3, 2025
2fb4d24
modified secrets baseline
vkuma17 Sep 3, 2025
02bfbd5
Update pr_test.go
vkuma17 Sep 4, 2025
4036cd4
Merge branch 'main' into split-obs
vkuma17 Sep 4, 2025
f5bd5d9
new vpc slz tile as dependency and region input mapping for SM
vkuma17 Sep 4, 2025
e60edd7
added region mapping for all supporting dependencies
vkuma17 Sep 4, 2025
615ae1f
modified wrapper version
vkuma17 Sep 5, 2025
7684813
modified diagram
vkuma17 Sep 5, 2025
8f76a71
modified diagram
vkuma17 Sep 5, 2025
64c59ec
modified diagram
vkuma17 Sep 5, 2025
0b12b21
modified diagram
vkuma17 Sep 5, 2025
b158d3e
modified diagram
vkuma17 Sep 5, 2025
159ad8a
modified diagram
vkuma17 Sep 5, 2025
8020221
modified diagram
vkuma17 Sep 5, 2025
032ad92
modified diagram
vkuma17 Sep 5, 2025
6dd1da5
modified diagram
vkuma17 Sep 5, 2025
172b3c3
modified qs diagram
vkuma17 Sep 5, 2025
fca50d5
modified diagram
vkuma17 Sep 5, 2025
6f39686
modified diagram
vkuma17 Sep 5, 2025
0228b6a
Update ibm_catalog.json
vkuma17 Sep 5, 2025
4f2a065
Update ibm_catalog.json
vkuma17 Sep 5, 2025
e300003
Update ibm_catalog.json
vkuma17 Sep 5, 2025
972f4bf
wrapper version change
vkuma17 Sep 5, 2025
e715c93
disable SM for now
vkuma17 Sep 5, 2025
4d2a3f3
Update ibm_catalog.json
vkuma17 Sep 5, 2025
b994669
updated diagram
vkuma17 Sep 5, 2025
64f5bf2
fixed precommit
vkuma17 Sep 5, 2025
166be88
Update pr_test.go
vkuma17 Sep 6, 2025
eaa8a2f
new version of wrapper
vkuma17 Sep 8, 2025
4d36c3c
Merge branch 'main' into split-obs
vkuma17 Sep 8, 2025
cc4f3e9
Update pr_test.go
vkuma17 Sep 8, 2025
a3ac465
skipped addon test because of issues in projects
vkuma17 Sep 8, 2025
4ea2db3
unskip addon test
vkuma17 Sep 8, 2025
e481fcd
Merge branch 'main' into addon-tests
vkuma17 Sep 9, 2025
d2376b7
Update pr_test.go
vkuma17 Sep 9, 2025
0e45ee3
Merge branch 'main' into addon-tests
vkuma17 Sep 17, 2025
aef2202
updated common dev assets
vkuma17 Sep 17, 2025
576d50e
Update pr_test.go
vkuma17 Sep 17, 2025
60ffc73
updated common dev assets
vkuma17 Sep 18, 2025
04e7f63
Merge branch 'main' into addon-tests
vkuma17 Sep 18, 2025
aee0c31
updated common dev assets
vkuma17 Sep 18, 2025
319d697
Merge branch 'addon-tests' of github.com:terraform-ibm-modules/terraf…
vkuma17 Sep 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions tests/pr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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",
Expand All @@ -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",
Expand Down