Skip to content
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.

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

Fix failing CI tests due to Open Liberty devfile rename #3318

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tests/integration/devfile/cmd_devfile_catalog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var _ = Describe("odo devfile catalog command tests", func() {
"Odo Devfile Components",
"NAME",
"java-spring-boot",
"openLiberty",
"java-openliberty",
"quarkus",
"DESCRIPTION",
"REGISTRY",
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/devfile/cmd_devfile_create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,28 @@ var _ = Describe("odo devfile create command tests", func() {

Context("When executing odo create with devfile component type argument", func() {
It("should successfully create the devfile component", func() {
helper.CmdShouldPass("odo", "create", "openLiberty")
helper.CmdShouldPass("odo", "create", "java-openliberty")
})
})

Context("When executing odo create with devfile component type and component name arguments", func() {
It("should successfully create the devfile component", func() {
componentName := helper.RandString(6)
helper.CmdShouldPass("odo", "create", "openLiberty", componentName)
helper.CmdShouldPass("odo", "create", "java-openliberty", componentName)
})
})

Context("When executing odo create with devfile component type argument and --project flag", func() {
It("should successfully create the devfile component", func() {
componentNamespace := helper.RandString(6)
helper.CmdShouldPass("odo", "create", "openLiberty", "--project", componentNamespace)
helper.CmdShouldPass("odo", "create", "java-openliberty", "--project", componentNamespace)
})
})

Context("When executing odo create with devfile component type argument and --registry flag", func() {
It("should successfully create the devfile component", func() {
componentRegistry := "DefaultDevfileRegistry"
helper.CmdShouldPass("odo", "create", "openLiberty", "--registry", componentRegistry)
helper.CmdShouldPass("odo", "create", "java-openliberty", "--registry", componentRegistry)
})
})

Expand All @@ -92,7 +92,7 @@ var _ = Describe("odo devfile create command tests", func() {
envFilePath := filepath.Join(newContext, envFile)
helper.MakeDir(newContext)

helper.CmdShouldPass("odo", "create", "openLiberty", "--context", newContext)
helper.CmdShouldPass("odo", "create", "java-openliberty", "--context", newContext)
output := util.CheckPathExists(devfilePath)
Expect(output).Should(BeTrue())
output = util.CheckPathExists(envFilePath)
Expand All @@ -104,23 +104,23 @@ var _ = Describe("odo devfile create command tests", func() {
Context("When executing odo create with devfile component name that contains unsupported character", func() {
It("should failed with devfile component name is not valid and prompt supported character", func() {
componentName := "BAD@123"
output := helper.CmdShouldFail("odo", "create", "openLiberty", componentName)
output := helper.CmdShouldFail("odo", "create", "java-openliberty", componentName)
helper.MatchAllInOutput(output, []string{"Contain only lowercase alphanumeric characters or ‘-’"})
})
})

Context("When executing odo create with devfile component name that contains all numeric values", func() {
It("should failed with devfile component name is not valid and prompt container name must not contain all numeric values", func() {
componentName := "123456"
output := helper.CmdShouldFail("odo", "create", "openLiberty", componentName)
output := helper.CmdShouldFail("odo", "create", "java-openliberty", componentName)
helper.MatchAllInOutput(output, []string{"Must not contain all numeric values"})
})
})

Context("When executing odo create with devfile component name that contains more than 63 characters", func() {
It("should failed with devfile component name is not valid and prompt container name contains at most 63 characters", func() {
componentName := helper.RandString(64)
output := helper.CmdShouldFail("odo", "create", "openLiberty", componentName)
output := helper.CmdShouldFail("odo", "create", "java-openliberty", componentName)
helper.MatchAllInOutput(output, []string{"Contain at most 63 characters"})
})
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var _ = Describe("odo docker devfile catalog command tests", func() {
Context("When executing catalog list components on Docker", func() {
It("should list all supported devfile components", func() {
output := helper.CmdShouldPass("odo", "catalog", "list", "components")
helper.MatchAllInOutput(output, []string{"Odo Devfile Components", "java-spring-boot", "openLiberty"})
helper.MatchAllInOutput(output, []string{"Odo Devfile Components", "java-spring-boot", "java-openliberty"})
})
})

Expand Down