File tree Expand file tree Collapse file tree 4 files changed +47
-0
lines changed
integration-tests/src/test/java/oracle/weblogic/kubernetes Expand file tree Collapse file tree 4 files changed +47
-0
lines changed Original file line number Diff line number Diff line change 22
22
import oracle .weblogic .domain .Model ;
23
23
import oracle .weblogic .domain .OnlineUpdate ;
24
24
import oracle .weblogic .domain .ServerPod ;
25
+ import oracle .weblogic .kubernetes .annotations .DisabledOn12213Image ;
25
26
import oracle .weblogic .kubernetes .annotations .IntegrationTest ;
26
27
import oracle .weblogic .kubernetes .annotations .Namespaces ;
27
28
import oracle .weblogic .kubernetes .logging .LoggingFacade ;
@@ -151,6 +152,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
151
152
@ DisplayName ("Create WebLogic Domain with mii model with istio" )
152
153
@ Tag ("gate" )
153
154
@ Tag ("crio" )
155
+ @ DisabledOn12213Image
154
156
void testIstioModelInImageDomain () {
155
157
156
158
// Create the repo secret to pull the image
Original file line number Diff line number Diff line change @@ -335,6 +335,8 @@ public interface TestConstants {
335
335
"-Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.TrustKeyStore=DemoTrust" ;
336
336
337
337
public static final boolean WEBLOGIC_SLIM = WEBLOGIC_IMAGE_TAG .contains ("slim" );
338
+ public static final boolean WEBLOGIC_12213 = WEBLOGIC_IMAGE_TAG .contains ("12.2.1.3" )
339
+ && !WEBLOGIC_IMAGE_TAG .toLowerCase ().contains ("cpu" );
338
340
339
341
public static final String WEBLOGIC_VERSION = "12.2.1.4.0" ;
340
342
public static final String HTTP_PROXY =
Original file line number Diff line number Diff line change
1
+ // Copyright (c) 2022, Oracle and/or its affiliates.
2
+ // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3
+
4
+ package oracle .weblogic .kubernetes .annotations ;
5
+
6
+ import java .lang .annotation .ElementType ;
7
+ import java .lang .annotation .Retention ;
8
+ import java .lang .annotation .RetentionPolicy ;
9
+ import java .lang .annotation .Target ;
10
+
11
+ import oracle .weblogic .kubernetes .extensions .DisabledOn12213ImageCondition ;
12
+ import org .junit .jupiter .api .extension .ExtendWith ;
13
+
14
+ @ Target ({ElementType .TYPE , ElementType .METHOD })
15
+ @ Retention (RetentionPolicy .RUNTIME )
16
+ @ ExtendWith (DisabledOn12213ImageCondition .class )
17
+ public @interface DisabledOn12213Image {
18
+
19
+ }
Original file line number Diff line number Diff line change
1
+ // Copyright (c) 2022, Oracle and/or its affiliates.
2
+ // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3
+
4
+ package oracle .weblogic .kubernetes .extensions ;
5
+
6
+ import org .junit .jupiter .api .extension .ConditionEvaluationResult ;
7
+ import org .junit .jupiter .api .extension .ExecutionCondition ;
8
+ import org .junit .jupiter .api .extension .ExtensionContext ;
9
+
10
+ import static oracle .weblogic .kubernetes .TestConstants .WEBLOGIC_12213 ;
11
+
12
+ public class DisabledOn12213ImageCondition implements ExecutionCondition {
13
+
14
+ @ Override
15
+ public ConditionEvaluationResult evaluateExecutionCondition (ExtensionContext context ) {
16
+ // disable the test because of application deployment through REST interface issue
17
+ // and is included in WebLogic 12.2.1.3.0 CPU's"
18
+ if (WEBLOGIC_12213 ) {
19
+ return ConditionEvaluationResult .disabled ("Test disabled on WebLogic 12.2.1.3 image" );
20
+ } else {
21
+ return ConditionEvaluationResult .enabled ("Test enabled on non-12.2.1.3 WebLogic image" );
22
+ }
23
+ }
24
+ }
You can’t perform that action at this time.
0 commit comments