Skip to content

Commit

Permalink
Revert unnecessary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
nbelliot committed Apr 3, 2020
1 parent 7390bb4 commit 6e7e44f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,33 +38,16 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.FileReader;
import java.io.PrintStream;
import java.io.IOException;
import java.io.File;
import java.util.List;
import org.apache.commons.io.FileUtils;


import java.net.URLDecoder;
import java.util.Enumeration;
import java.util.Map;
import java.util.jar.Manifest;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.Attributes;
import java.util.logging.Level;
import java.util.logging.Logger;
import jenkins.tasks.SimpleBuildStep;
import org.apache.commons.io.FileUtils;
import org.kohsuke.stapler.DataBoundConstructor;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;

/**
* VectorCAST setup build action
*/
Expand Down Expand Up @@ -486,10 +469,8 @@ public void perform(Run<?,?> build, FilePath workspace, Launcher launcher, TaskL
jFile = new JarFile(testPath);
printVersion( listener.getLogger() );
Enumeration<JarEntry> entries = jFile.entries();

while (entries.hasMoreElements()) {
JarEntry entry = entries.nextElement();

if (entry.getName().startsWith("scripts")) {
String fileOrDir = entry.getName().substring(8); // length of scripts/
FilePath dest = new FilePath(destScriptDir, fileOrDir);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import java.net.URLDecoder;
import java.util.jar.Manifest;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.Attributes;


/**
Expand Down Expand Up @@ -336,15 +331,6 @@ private String getBaseJenkinsfile() throws IOException {
* @return script portion of pipeline job.
* @throws IOException
*/

/**
* Generates the <script> portion of the config.xml which defines the pipeline.
* for this pipeline job.
*
*
* @return script portion of pipeline job.
* @throws IOException
*/

private String generateJenkinsfile() throws IOException {
String setup = "";
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/scripts/baseJenkinsfile.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ def transformIntoStep(inputString) {
// Run the setup step to copy over the scripts
step([$class: 'VectorCASTSetup'])


if (VC_usingSCM && !VC_useOneCheckoutDir) {
// set options for each manage project pulled out out of SCM
setupManageProject()
Expand Down

0 comments on commit 6e7e44f

Please sign in to comment.