From 045dff380913d9be0e8756ca9841672d03295b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20P=C3=B6nisch?= Date: Fri, 27 May 2016 14:05:02 +0200 Subject: [PATCH] [JENKINS-31999] set Windows only restriction to some publishers --- .../plugins/ecutest/report/AbstractReportPublisher.java | 2 -- .../jenkins/plugins/ecutest/report/atx/ATXPublisher.java | 4 +++- .../ecutest/report/generator/ReportGeneratorPublisher.java | 2 ++ .../jenkins/plugins/ecutest/report/junit/JUnitPublisher.java | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/AbstractReportPublisher.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/AbstractReportPublisher.java index a2d1df27..acebd6e0 100644 --- a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/AbstractReportPublisher.java +++ b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/AbstractReportPublisher.java @@ -64,7 +64,6 @@ import de.tracetronic.jenkins.plugins.ecutest.report.log.ETLogPublisher; import de.tracetronic.jenkins.plugins.ecutest.report.trf.TRFPublisher; import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation; -import de.tracetronic.jenkins.plugins.ecutest.util.ProcessUtil; /** * Common base class for {@link ATXPublisher}, {@link ETLogPublisher}, {@link JUnitPublisher} and {@link TRFPublisher}. @@ -220,7 +219,6 @@ public void perform(final Run run, final FilePath workspace, final Launche } try { - ProcessUtil.checkOS(launcher); performReport(run, workspace, launcher, listener); } catch (final IOException e) { Util.displayIOException(e, listener); diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/atx/ATXPublisher.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/atx/ATXPublisher.java index c2bc15e5..5990b61e 100644 --- a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/atx/ATXPublisher.java +++ b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/atx/ATXPublisher.java @@ -79,6 +79,7 @@ import de.tracetronic.jenkins.plugins.ecutest.tool.client.ETClient; import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation; import de.tracetronic.jenkins.plugins.ecutest.util.ATXUtil; +import de.tracetronic.jenkins.plugins.ecutest.util.ProcessUtil; import de.tracetronic.jenkins.plugins.ecutest.util.validation.ATXValidator; /** @@ -170,6 +171,7 @@ public void performReport(final Run run, final FilePath workspace, final L final TaskListener listener) throws InterruptedException, IOException, ETPluginException { final TTConsoleLogger logger = new TTConsoleLogger(listener); logger.logInfo("Publishing ATX reports..."); + ProcessUtil.checkOS(launcher); final Result buildResult = run.getResult(); if (buildResult != null && !canContinue(buildResult)) { @@ -237,7 +239,7 @@ public void performReport(final Run run, final FilePath workspace, final L */ private boolean publishReports(final ATXInstallation installation, final Run run, final Launcher launcher, final TaskListener listener) - throws IOException, InterruptedException { + throws IOException, InterruptedException { final TTConsoleLogger logger = new TTConsoleLogger(listener); final boolean isUploadEnabled = isUploadEnabled(installation); final boolean isServerReachable = isServerReachable(installation, launcher, run.getEnvironment(listener)); diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/generator/ReportGeneratorPublisher.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/generator/ReportGeneratorPublisher.java index 52b0d1d7..d404119f 100644 --- a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/generator/ReportGeneratorPublisher.java +++ b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/generator/ReportGeneratorPublisher.java @@ -62,6 +62,7 @@ import de.tracetronic.jenkins.plugins.ecutest.tool.client.ETClient; import de.tracetronic.jenkins.plugins.ecutest.tool.installation.AbstractToolInstallation; import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation; +import de.tracetronic.jenkins.plugins.ecutest.util.ProcessUtil; /** * Publisher providing links to saved {@link GeneratorReport}s. @@ -240,6 +241,7 @@ public void performReport(final Run run, final FilePath workspace, final L final TaskListener listener) throws InterruptedException, IOException, ETPluginException { final TTConsoleLogger logger = new TTConsoleLogger(listener); logger.logInfo("Publishing generator reports..."); + ProcessUtil.checkOS(launcher); final Result buildResult = run.getResult(); if (buildResult != null && !canContinue(buildResult)) { diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/junit/JUnitPublisher.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/junit/JUnitPublisher.java index 0d1318ac..3f2563d5 100644 --- a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/junit/JUnitPublisher.java +++ b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/junit/JUnitPublisher.java @@ -68,6 +68,7 @@ import de.tracetronic.jenkins.plugins.ecutest.report.AbstractReportPublisher; import de.tracetronic.jenkins.plugins.ecutest.tool.installation.AbstractToolInstallation; import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation; +import de.tracetronic.jenkins.plugins.ecutest.util.ProcessUtil; import de.tracetronic.jenkins.plugins.ecutest.util.validation.JUnitValidator; /** @@ -230,6 +231,7 @@ public void performReport(final Run run, final FilePath workspace, final L final TaskListener listener) throws InterruptedException, IOException, ETPluginException { final TTConsoleLogger logger = new TTConsoleLogger(listener); logger.logInfo("Publishing UNIT reports..."); + ProcessUtil.checkOS(launcher); final Result buildResult = run.getResult(); if (buildResult != null && !canContinue(buildResult)) {