Skip to content

backport owls-96203 ( FmwSample Failure ) #2761

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

Merged
merged 2 commits into from
Feb 2, 2022
Merged

backport owls-96203 ( FmwSample Failure ) #2761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f81acf1
Backport owls-96203
Feb 2, 2022
dd8826d
remove voyager tests
Feb 2, 2022
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: 2 additions & 0 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@
**/ItMiiDynamicUpdate,
**/ItMiiSampleWlsMain,
**/ItMiiSampleWlsAux,
**/ItFmwSample,
**/ItWlsSamples,
**/ItMiiMultiModel
</includes-failsafe>
</properties>
Expand Down
22 changes: 2 additions & 20 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItWlsSamples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ class ItWlsSamples {

private static String traefikNamespace = null;
private static String nginxNamespace = null;
private static String voyagerNamespace = null;
private static String domainNamespace = null;
private static final String domainName = "domain1";
private static final String diiImageNameBase = "domain-home-in-image";
Expand Down Expand Up @@ -119,7 +118,7 @@ class ItWlsSamples {
* @param namespaces injected by JUnit
*/
@BeforeAll
public static void initAll(@Namespaces(5) List<String> namespaces) {
public static void initAll(@Namespaces(4) List<String> namespaces) {
logger = getLogger();

logger.info("Assign a unique namespace for operator");
Expand All @@ -137,10 +136,6 @@ public static void initAll(@Namespaces(5) List<String> namespaces) {
assertNotNull(namespaces.get(3), "Namespace is null");
nginxNamespace = namespaces.get(3);

logger.info("Assign a unique namespace for Voyager controller");
assertNotNull(namespaces.get(4), "Namespace is null");
voyagerNamespace = namespaces.get(4);

// create pull secrets for WebLogic image when running in non Kind Kubernetes cluster
// this secret is used only for non-kind cluster
createSecretForBaseImages(domainNamespace);
Expand Down Expand Up @@ -368,23 +363,10 @@ void testTraefikIngressController() {
setupLoadBalancer(scriptBase, "traefik", " -d -n " + traefikNamespace);
}

/**
* Verify setupLoadBalancer scripts for managing Voyager LoadBalancer.
*/
@Order(8)
@Test
@DisplayName("Manage Voyager Ingress Controller with setupLoadBalancer")
void testVoyagerIngressController() {
setupSample();
Path scriptBase = Paths.get(tempSamplePath.toString(), "charts/util");
setupLoadBalancer(scriptBase, "voyager", " -c -n " + voyagerNamespace);
setupLoadBalancer(scriptBase, "voyager", " -d -n " + voyagerNamespace);
}

/**
* Verify setupLoadBalancer scripts for managing Nginx LoadBalancer.
*/
@Order(9)
@Order(8)
@Test
@DisplayName("Manage Nginx Ingress Controller with setupLoadBalancer")
void testNginxIngressController() {
Expand Down
4 changes: 2 additions & 2 deletions ...es/scripts/create-fmw-infrastructure-domain/domain-home-on-pv/wdt_k8s_model_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2017, 2021, Oracle and/or its affiliates.
# Copyright (c) 2017, 2022, Oracle and/or its affiliates.

#
# This is the template for kubernetes section for wdt_model file. This
Expand Down Expand Up @@ -88,7 +88,7 @@ kubernetes:
%EXPOSE_ANY_CHANNEL_PREFIX% default:
%EXPOSE_ADMIN_PORT_PREFIX% nodePort: %ADMIN_NODE_PORT%
# Uncomment to export the T3Channel as a service
%EXPOSE_T3_CHANNEL_PREFIX% T3Channel:
%EXPOSE_T3_CHANNEL_PREFIX% T3Channel:

# Istio service mesh support is experimental.
%ISTIO_PREFIX%configuration:
Expand Down
4 changes: 2 additions & 2 deletions ...etes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt_k8s_model_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2017, 2021, Oracle and/or its affiliates.
# Copyright (c) 2017, 2022, Oracle and/or its affiliates.

#
# This is the template for kubernetes section for wdt_model file. This
Expand Down Expand Up @@ -89,7 +89,7 @@ kubernetes:
%EXPOSE_ANY_CHANNEL_PREFIX% default:
%EXPOSE_ADMIN_PORT_PREFIX% nodePort: %ADMIN_NODE_PORT%
# Uncomment to export the T3Channel as a service
%EXPOSE_T3_CHANNEL_PREFIX% T3Channel:
%EXPOSE_T3_CHANNEL_PREFIX% T3Channel:

# clusters is used to configure the desired behavior for starting member servers of a cluster.
# If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
Expand Down