Skip to content

Commit

Permalink
fix: resolve the failing e2e appset tests for ksonnet applications (c…
Browse files Browse the repository at this point in the history
…herry-pick #21580) (#21606)

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
Co-authored-by: Regina Voloshin <regina.voloshin@codefresh.io>
  • Loading branch information
gcp-cherry-pick-bot[bot] and reggie-k authored Jan 21, 2025
1 parent b6e1080 commit 4ba830f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions test/e2e/applicationset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,6 @@ func TestSimpleGitDirectoryGenerator(t *testing.T) {
expectedApps := []argov1alpha1.Application{
generateExpectedApp("kustomize-guestbook"),
generateExpectedApp("helm-guestbook"),
generateExpectedApp("ksonnet-guestbook"),
}

var expectedAppsNewNamespace []argov1alpha1.Application
Expand Down Expand Up @@ -1256,7 +1255,6 @@ func TestSimpleGitDirectoryGeneratorGoTemplate(t *testing.T) {
expectedApps := []argov1alpha1.Application{
generateExpectedApp("kustomize-guestbook"),
generateExpectedApp("helm-guestbook"),
generateExpectedApp("ksonnet-guestbook"),
}

var expectedAppsNewNamespace []argov1alpha1.Application
Expand Down
6 changes: 0 additions & 6 deletions test/e2e/matrix_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ func TestListMatrixGenerator(t *testing.T) {
expectedApps := []argov1alpha1.Application{
generateExpectedApp("cluster1", "kustomize-guestbook"),
generateExpectedApp("cluster1", "helm-guestbook"),
generateExpectedApp("cluster1", "ksonnet-guestbook"),

generateExpectedApp("cluster2", "kustomize-guestbook"),
generateExpectedApp("cluster2", "helm-guestbook"),
generateExpectedApp("cluster2", "ksonnet-guestbook"),
}

var expectedAppsNewNamespace []argov1alpha1.Application
Expand Down Expand Up @@ -170,11 +168,9 @@ func TestClusterMatrixGenerator(t *testing.T) {
expectedApps := []argov1alpha1.Application{
generateExpectedApp("cluster1", "kustomize-guestbook"),
generateExpectedApp("cluster1", "helm-guestbook"),
generateExpectedApp("cluster1", "ksonnet-guestbook"),

generateExpectedApp("cluster2", "kustomize-guestbook"),
generateExpectedApp("cluster2", "helm-guestbook"),
generateExpectedApp("cluster2", "ksonnet-guestbook"),
}

var expectedAppsNewNamespace []argov1alpha1.Application
Expand Down Expand Up @@ -298,12 +294,10 @@ func TestMatrixTerminalMatrixGeneratorSelector(t *testing.T) {
expectedApps1 := []argov1alpha1.Application{
generateExpectedApp("cluster1", "kustomize-guestbook"),
generateExpectedApp("cluster1", "helm-guestbook"),
generateExpectedApp("cluster1", "ksonnet-guestbook"),
}
expectedApps2 := []argov1alpha1.Application{
generateExpectedApp("cluster2", "kustomize-guestbook"),
generateExpectedApp("cluster2", "helm-guestbook"),
generateExpectedApp("cluster2", "ksonnet-guestbook"),
}

Given(t).
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/merge_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,9 @@ func TestClusterMergeGenerator(t *testing.T) {
expectedApps := []argov1alpha1.Application{
generateExpectedApp("cluster1", "kustomize-guestbook", "1"),
generateExpectedApp("cluster1", "helm-guestbook", "0"),
generateExpectedApp("cluster1", "ksonnet-guestbook", "0"),

generateExpectedApp("cluster2", "kustomize-guestbook", "0"),
generateExpectedApp("cluster2", "helm-guestbook", "2"),
generateExpectedApp("cluster2", "ksonnet-guestbook", "0"),
}

var expectedAppsNewNamespace []argov1alpha1.Application
Expand Down

0 comments on commit 4ba830f

Please sign in to comment.