Skip to content

Fixed intermittent failures in MonExporter due failure to download webapp war file #2625

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 12 commits into from
Nov 16, 2021
Merged

Fixed intermittent failures in MonExporter due failure to download webapp war file #2625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4d95dab
added shutdown for domains
marinakog Nov 2, 2021
373b86e
Merge branch 'main' of https://github.com/oracle/weblogic-kubernetes-…
marinakog Nov 2, 2021
7e0f847
added shutdown domain to methods
marinakog Nov 2, 2021
c29a446
removed files
marinakog Nov 3, 2021
e23be29
Merge branch 'main' of https://github.com/oracle/weblogic-kubernetes-…
marinakog Nov 10, 2021
8e30a01
added check for webapp download
marinakog Nov 10, 2021
2fc9a28
fixed intermitent failure for service account creation
marinakog Nov 11, 2021
49ef510
fixed logic
marinakog Nov 11, 2021
c1d65db
corrected logic
marinakog Nov 11, 2021
6b55626
fixed logic
marinakog Nov 11, 2021
d3f55bd
reset
marinakog Nov 12, 2021
bee37f7
fixed npe
marinakog Nov 15, 2021
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
20 changes: 12 additions & 8 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/assertions/impl/Kubernetes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,16 +664,20 @@ public static boolean isDeploymentReady(String deploymentName,
boolean status = false;
V1Deployment deployment = getDeployment(deploymentName, label, namespace);

V1DeploymentCondition v1DeploymentRunningCondition = Optional.ofNullable(deployment)
List<V1DeploymentCondition> deplList = Optional.ofNullable(deployment)
.map(V1Deployment::getStatus).map(V1DeploymentStatus::getConditions)
.orElse(null).stream()
.filter(v1DeploymentCondition -> "Available".equals(v1DeploymentCondition.getType()))
.findAny()
.orElse(null);
if (v1DeploymentRunningCondition != null) {
status = v1DeploymentRunningCondition.getStatus().equalsIgnoreCase("true");
} else {
getLogger().info("Can't check deployment status");
if (deplList != null) {
V1DeploymentCondition v1DeploymentRunningCondition = deplList.stream()
.filter(v1DeploymentCondition -> "Available".equals(v1DeploymentCondition.getType()))
.findAny()
.orElse(null);

if (v1DeploymentRunningCondition != null) {
status = v1DeploymentRunningCondition.getStatus().equalsIgnoreCase("true");
} else {
getLogger().info("Can't check deployment status");
}
}
return status;
}
Expand Down
20 changes: 14 additions & 6 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,28 @@ public static void downloadMonitoringExporterApp(String configFile, String appli
.command(command))
.execute(), "Failed to download monitoring exporter webapp");

command = String.format("cd %s && %s %s",
String command1 = String.format("cd %s && %s %s",
applicationDir,
monitoringExporterBuildFile,
configFile);
assertTrue(new Command()
.withParams(new CommandParams()
.command(command))
.execute(), "Failed to build monitoring exporter webapp");

testUntil(
(() -> new Command()
.withParams(
new CommandParams()
.verbose(true)
.command(command1))
.executeAndVerify("adding: config.yml")
),
logger,
"Downloading monitoring exporter webapp");

assertDoesNotThrow(() -> checkFile(applicationDir + "/wls-exporter.war"),
"Monitoring Exporter web application file was not found");
}

/**
* Build monitoring exporter web applicaiont wls-exporter.war with provided configuration
* Build monitoring exporter web applicaiont wls-exporter.war with provided configuration
* @param monitoringExporterSrcDir directory containing github monitoring exporter
* @param configFile configuration file for weblogic domain monitoring
* @param appDir directory where war file will be created
Expand Down