Skip to content
Permalink
Browse files

Revert "[JENKINS-50598] - File type check causes issues in jenkins/pc…

…t Docker image when a WAR is passed from volume"

This reverts commit 0ab49c3.
  • Loading branch information...
oleg-nenashev committed Apr 6, 2018
1 parent 0ab49c3 commit 282dbfe4031857db549092ba8346dc5c8ee6da3e
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/main/java/org/jvnet/hudson/test/WarExploder.java
@@ -93,13 +93,13 @@ private static File explode() throws Exception {
final File war;
if (JENKINS_WAR_PATH != null) {
war = new File(JENKINS_WAR_PATH).getAbsoluteFile();
LOGGER.log(Level.INFO, "Using a predefined WAR file {0} define by the {1} system property",
LOGGER.log(Level.INFO, "Using a predefined WAR file {0} define by the -{1} system property",
new Object[] {war, JENKINS_WAR_PATH_PROPERTY_NAME});
if (!war.exists()) {
throw new IOException("A Predefined WAR file path does not exist: " + war);
} /* Causes issues in jenkins/pct run when WAR comes from the volume - else if (!war.isFile()) {
} else if (!war.isFile()) {
throw new IOException("A Predefined WAR file path does not point to a file: " + war);
}*/
}
} else {
// locate jenkins.war
URL winstone = WarExploder.class.getResource("/winstone.jar");

0 comments on commit 282dbfe

Please sign in to comment.
You can’t perform that action at this time.