|
1 | 1 | package e2escenarios
|
2 | 2 |
|
3 | 3 | import (
|
| 4 | + "fmt" |
| 5 | + |
4 | 6 | "github.com/redhat-developer/odo/tests/helper"
|
5 | 7 |
|
6 | 8 | . "github.com/onsi/ginkgo"
|
@@ -82,14 +84,34 @@ var _ = Describe("odo devfile supported tests", func() {
|
82 | 84 | // Otherwise, spec nodes would pick the last element off the loop.
|
83 | 85 | opts := o.opts
|
84 | 86 |
|
| 87 | + skipNoSupervisord := func(devfile string) { |
| 88 | + var noSupervisord bool |
| 89 | + for _, opt := range opts { |
| 90 | + if opt == "--no-supervisord" { |
| 91 | + noSupervisord = true |
| 92 | + break |
| 93 | + } |
| 94 | + } |
| 95 | + |
| 96 | + if noSupervisord { |
| 97 | + Skip(fmt.Sprintf(`%q Devfile in the default registry defines terminating container components. |
| 98 | +As such, it cannot be used as is without overriding container entrypoints with Supervisord. |
| 99 | +Remove this once the default Devfile registry has been updated accordingly. |
| 100 | +See https://github.com/devfile/registry/pull/102 |
| 101 | +`, devfile)) |
| 102 | + } |
| 103 | + } |
| 104 | + |
85 | 105 | Context("odo debug support for devfile components", func() {
|
86 | 106 | It("Verify output debug information for nodeJS debug works", func() {
|
| 107 | + skipNoSupervisord("nodejs") |
87 | 108 | createStarterProjAndSetDebug("nodejs", "nodejs-starter", opts...)
|
88 | 109 | })
|
89 | 110 | It("Verify output debug information for java-springboot works", func() {
|
90 | 111 | createStarterProjAndSetDebug("java-springboot", "springbootproject", opts...)
|
91 | 112 | })
|
92 | 113 | It("Verify output debug information for java-quarkus debug works", func() {
|
| 114 | + skipNoSupervisord("java-quarkus") |
93 | 115 | createStarterProjAndSetDebug("java-quarkus", "community", opts...)
|
94 | 116 | })
|
95 | 117 | It("Verify output debug information for java-maven debug works", func() {
|
|
0 commit comments