Skip to content

🧪 Fix mta 801 test failing on OCP #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
stillalearner wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

🧪 Fix mta 801 test failing on OCP #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions e2e-tests/tests/tier0/mta_801_stateful_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ var _ = Describe("Stateful app migration", func() {
tgtApp := scenario.TgtApp
kubectlSrc := scenario.KubectlSrc
kubectlTgt := scenario.KubectlTgt
isOpenShift := kubectlSrc.IsOpenShift()

By("Prepare source app")
log.Printf("Preparing source app %s in namespace %s\n", srcApp.Name, srcApp.Namespace)
Expand Down Expand Up @@ -63,16 +64,20 @@ var _ = Describe("Stateful app migration", func() {
Expect(RunCranePipelineWithChecks(runner, exportOpts, transformOpts, applyOpts)).NotTo(HaveOccurred())
log.Printf("Crane pipeline completed for namespace %s\n", srcApp.Namespace)
By("Compare YAML semantic diff of golden and actual export files")
goldenExportDir, err := utils.GoldenManifestsDir(appName, "export")
goldenExportDir, err := utils.GoldenManifestsDirForPlatform(appName, "export", isOpenShift)
Expect(err).NotTo(HaveOccurred())
if err := utils.CompareDirectoryYAMLSemanticsExport(goldenExportDir, paths.ExportDir); err != nil {
compareExport := utils.CompareDirectoryYAMLSemanticsExport
if isOpenShift {
compareExport = utils.CompareDirectoryYAMLSemanticsExportAllowOptionalOCPOutputDefaults
}
if err := compareExport(goldenExportDir, paths.ExportDir); err != nil {
Fail(fmt.Sprintf("YAML semantic diff of golden and actual export files: %v", err))
} else {
log.Printf("YAML semantic diff of golden and actual export files: no differences found")
}
log.Printf("Yaml diff comparison completed for export files successfully")
By("Compare YAML semantic diff of golden and actual output files")
goldenOutputDir, err := utils.GoldenManifestsDir(appName, "output")
goldenOutputDir, err := utils.GoldenManifestsDirForPlatform(appName, "output", isOpenShift)
Expect(err).NotTo(HaveOccurred())
if err := utils.CompareDirectoryYAMLSemantics(goldenOutputDir, paths.OutputDir); err != nil {
Fail(fmt.Sprintf("YAML semantic diff of golden and actual output files: %v", err))
Expand Down
8 changes: 8 additions & 0 deletions e2e-tests/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,21 @@ func isOptionalOCPOutputIdentity(identity string) bool {
strings.HasSuffix(identity, "|system:image-builders") ||
strings.HasSuffix(identity, "|system:image-pullers")):
return true
case strings.HasPrefix(identity, "authorization.openshift.io/v1|RoleBinding|") &&
(strings.HasSuffix(identity, "|system:deployers") ||
strings.HasSuffix(identity, "|system:image-builders") ||
strings.HasSuffix(identity, "|system:image-pullers")):
return true
case strings.HasPrefix(identity, "v1|ServiceAccount|") &&
(strings.HasSuffix(identity, "|builder") ||
strings.HasSuffix(identity, "|deployer")):
return true
case strings.HasPrefix(identity, "v1|ConfigMap|") &&
strings.HasSuffix(identity, "|openshift-service-ca.crt"):
return true
case strings.HasPrefix(identity, "v1|Secret|") &&
strings.Contains(identity, "|dockercfg:"):
return true
default:
return false
}
Expand Down
Loading