package org.jenkinsci.plugins.p4; import com.perforce.p4java.exception.P4JavaException; import com.perforce.p4java.impl.generic.core.Label; import hudson.AbortException; import hudson.EnvVars; import hudson.Extension; import hudson.FilePath; import hudson.Launcher; import hudson.Plugin; import hudson.matrix.MatrixBuild; import hudson.matrix.MatrixConfiguration; import hudson.matrix.MatrixExecutionStrategy; import hudson.matrix.MatrixProject; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Item; import hudson.model.Job; import hudson.model.Node; import hudson.model.Run; import hudson.model.TaskListener; import hudson.scm.ChangeLogParser; import hudson.scm.PollingResult; import hudson.scm.SCM; import hudson.scm.SCMDescriptor; import hudson.scm.SCMRevisionState; import hudson.util.FormValidation; import hudson.util.ListBoxModel; import hudson.util.LogTaskListener; import jenkins.model.Jenkins; import net.sf.json.JSONException; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.jenkinsci.plugins.multiplescms.MultiSCM; import org.jenkinsci.plugins.p4.browsers.P4Browser; import org.jenkinsci.plugins.p4.browsers.SwarmBrowser; import org.jenkinsci.plugins.p4.build.ExecutorHelper; import org.jenkinsci.plugins.p4.build.NodeHelper; import org.jenkinsci.plugins.p4.build.P4EnvironmentContributor; import org.jenkinsci.plugins.p4.changes.P4ChangeEntry; import org.jenkinsci.plugins.p4.changes.P4ChangeParser; import org.jenkinsci.plugins.p4.changes.P4ChangeRef; import org.jenkinsci.plugins.p4.changes.P4ChangeSet; import org.jenkinsci.plugins.p4.changes.P4GraphRef; import org.jenkinsci.plugins.p4.changes.P4LabelRef; import org.jenkinsci.plugins.p4.changes.P4Ref; import org.jenkinsci.plugins.p4.client.ConnectionHelper; import org.jenkinsci.plugins.p4.credentials.P4BaseCredentials; import org.jenkinsci.plugins.p4.credentials.P4CredentialsImpl; import org.jenkinsci.plugins.p4.filters.Filter; import org.jenkinsci.plugins.p4.filters.FilterPerChangeImpl; import org.jenkinsci.plugins.p4.matrix.MatrixOptions; import org.jenkinsci.plugins.p4.populate.Populate; import org.jenkinsci.plugins.p4.review.P4Review; import org.jenkinsci.plugins.p4.review.ReviewProp; import org.jenkinsci.plugins.p4.tagging.TagAction; import org.jenkinsci.plugins.p4.tasks.CheckoutStatus; import org.jenkinsci.plugins.p4.tasks.CheckoutTask; import org.jenkinsci.plugins.p4.tasks.PollTask; import org.jenkinsci.plugins.p4.tasks.RemoveClientTask; import org.jenkinsci.plugins.p4.workspace.ManualWorkspaceImpl; import org.jenkinsci.plugins.p4.workspace.SpecWorkspaceImpl; import org.jenkinsci.plugins.p4.workspace.StaticWorkspaceImpl; import org.jenkinsci.plugins.p4.workspace.StreamWorkspaceImpl; import org.jenkinsci.plugins.p4.workspace.TemplateWorkspaceImpl; import org.jenkinsci.plugins.p4.workspace.Workspace; import org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; public class PerforceScm extends SCM { private static Logger logger = Logger.getLogger(PerforceScm.class.getName()); private final String credential; private final Workspace workspace; private final List<Filter> filter; private final Populate populate; private final P4Browser browser; private transient List<P4Ref> incrementalChanges; private transient P4Ref parentChange; private transient P4Review review; public static final int DEFAULT_FILE_LIMIT = 50; public static final int DEFAULT_CHANGE_LIMIT = 20; public String getCredential() { return credential; } public Workspace getWorkspace() { return workspace; } public List<Filter> getFilter() { return filter; } public Populate getPopulate() { return populate; } @Override public P4Browser getBrowser() { return browser; } public List<P4Ref> getIncrementalChanges() { return incrementalChanges; } public P4Review getReview() { return review; } public void setReview(P4Review review) { this.review = review; } /** * Helper function for converting an SCM object into a * PerforceScm object when appropriate. * * @param scm the SCM object * @return a PerforceScm instance or null */ public static PerforceScm convertToPerforceScm(SCM scm) { PerforceScm perforceScm = null; if (scm instanceof PerforceScm) { perforceScm = (PerforceScm) scm; } else { Jenkins jenkins = Jenkins.getInstance(); if (jenkins != null) { Plugin multiSCMPlugin = jenkins.getPlugin("multiple-scms"); if (multiSCMPlugin != null) { if (scm instanceof MultiSCM) { MultiSCM multiSCM = (MultiSCM) scm; for (SCM configuredSCM : multiSCM.getConfiguredSCMs()) { if (configuredSCM instanceof PerforceScm) { perforceScm = (PerforceScm) configuredSCM; break; } } } } } } return perforceScm; } /** * Create a constructor that takes non-transient fields, and add the * annotation @DataBoundConstructor to it. Using the annotation helps the * Stapler class to find which constructor that should be used when * automatically copying values from a web form to a class. * * @param credential Credential ID * @param workspace Workspace connection details * @param filter Polling filters * @param populate Populate options * @param browser Browser options */ @DataBoundConstructor public PerforceScm(String credential, Workspace workspace, List<Filter> filter, Populate populate, P4Browser browser) { this.credential = credential; this.workspace = workspace; this.filter = filter; this.populate = populate; this.browser = browser; } public PerforceScm(String credential, Workspace workspace, Populate populate) { this.credential = credential; this.workspace = workspace; this.filter = null; this.populate = populate; this.browser = null; } @Override public String getKey() { String delim = "-"; StringBuffer key = new StringBuffer("p4"); // add Credential key.append(delim); key.append(credential); // add Mapping/Stream key.append(delim); if (workspace instanceof ManualWorkspaceImpl) { ManualWorkspaceImpl ws = (ManualWorkspaceImpl) workspace; key.append(ws.getSpec().getView()); key.append(ws.getSpec().getStreamName()); } if (workspace instanceof StreamWorkspaceImpl) { StreamWorkspaceImpl ws = (StreamWorkspaceImpl) workspace; key.append(ws.getStreamName()); } if (workspace instanceof SpecWorkspaceImpl) { SpecWorkspaceImpl ws = (SpecWorkspaceImpl) workspace; key.append(ws.getSpecPath()); } if (workspace instanceof StaticWorkspaceImpl) { StaticWorkspaceImpl ws = (StaticWorkspaceImpl) workspace; key.append(ws.getName()); } if (workspace instanceof TemplateWorkspaceImpl) { TemplateWorkspaceImpl ws = (TemplateWorkspaceImpl) workspace; key.append(ws.getTemplateName()); } return key.toString(); } public static P4Browser findBrowser(String scmCredential) { // Retrieve item from request StaplerRequest req = Stapler.getCurrentRequest(); Job job = req == null ? null : req.findAncestorObject(Job.class); // If cannot retrieve item, check from root P4BaseCredentials credentials = job == null ? ConnectionHelper.findCredential(scmCredential, Jenkins.getActiveInstance()) : ConnectionHelper.findCredential(scmCredential, job); if (credentials == null) { logger.fine("Could not retrieve credentials from id: '${scmCredential}"); return null; } try { ConnectionHelper connection = new ConnectionHelper(credentials, null); String url = connection.getSwarm(); if (url != null) { return new SwarmBrowser(url); } else { return null; } } catch (P4JavaException e) { logger.info("Unable to access Perforce Property."); return null; } } /** * Calculate the state of the workspace of the given build. The returned * object is then fed into compareRemoteRevisionWith as the baseline * SCMRevisionState to determine if the build is necessary, and is added to * the build as an Action for later retrieval. */ @Override public SCMRevisionState calcRevisionsFromBuild(Run<?, ?> run, FilePath buildWorkspace, Launcher launcher, TaskListener listener) throws IOException, InterruptedException { // A baseline is not required... but a baseline object is, so we'll // return the NONE object. return SCMRevisionState.NONE; } /** * This method does the actual polling and returns a PollingResult. The * change attribute of the PollingResult the significance of the changes * detected by this poll. */ @Override public PollingResult compareRemoteRevisionWith(Job<?, ?> job, Launcher launcher, FilePath buildWorkspace, TaskListener listener, SCMRevisionState baseline) throws IOException, InterruptedException { PollingResult state = PollingResult.NO_CHANGES; Node node = NodeHelper.workspaceToNode(buildWorkspace); if (job.isBuilding() && !isConcurrentBuild(job)) { listener.getLogger().println("Build in progress and concurrent builds disabled, polling delayed."); return PollingResult.NO_CHANGES; } // Get last run and build workspace Run<?, ?> lastRun = job.getLastBuild(); // Build workspace is often null as requiresWorkspaceForPolling() returns false as a checked out workspace is // not needed, but we still need a client and artificial root for the view. // JENKINS-46908 if (buildWorkspace == null) { String defaultRoot = job.getRootDir().getAbsoluteFile().getAbsolutePath(); if (lastRun != null) { EnvVars env = lastRun.getEnvironment(listener); buildWorkspace = new FilePath(new File(env.get("WORKSPACE", defaultRoot))); } else { listener.getLogger().println("Warning Jenkins Workspace root not defined."); return PollingResult.NO_CHANGES; } } if (job instanceof MatrixProject) { if (isBuildParent(job)) { // Poll PARENT only EnvVars envVars = job.getEnvironment(node, listener); state = pollWorkspace(envVars, listener, buildWorkspace, lastRun); } else { // Poll CHILDREN only MatrixProject matrixProj = (MatrixProject) job; Collection<MatrixConfiguration> configs = matrixProj.getActiveConfigurations(); for (MatrixConfiguration config : configs) { EnvVars envVars = config.getEnvironment(node, listener); state = pollWorkspace(envVars, listener, buildWorkspace, lastRun); // exit early if changes found if (state == PollingResult.BUILD_NOW) { return PollingResult.BUILD_NOW; } } } } else { EnvVars envVars = job.getEnvironment(node, listener); state = pollWorkspace(envVars, listener, buildWorkspace, lastRun); } return state; } private boolean isConcurrentBuild(Job<?, ?> job) { return job instanceof AbstractProject ? ((AbstractProject) job).isConcurrentBuild() : job.getProperty(DisableConcurrentBuildsJobProperty.class) == null; } /** * Construct workspace from environment and then look for changes. * * @param envVars * @param listener * @throws InterruptedException * @throws IOException */ private PollingResult pollWorkspace(EnvVars envVars, TaskListener listener, FilePath buildWorkspace, Run<?, ?> lastRun) throws InterruptedException, IOException { PrintStream log = listener.getLogger(); // set NODE_NAME to Node or default "master" if not set String nodeName = NodeHelper.getNodeName(buildWorkspace); envVars.put("NODE_NAME", envVars.get("NODE_NAME", nodeName)); String executor = ExecutorHelper.getExecutorID(buildWorkspace); envVars.put("EXECUTOR_NUMBER", envVars.get("EXECUTOR_NUMBER", executor)); Workspace ws = (Workspace) workspace.clone(); // JENKINS-48434 by setting rootPath to null will leave client's root unchanged ws.setRootPath(null); ws.setExpand(envVars); // Set EXPANDED client String client = ws.getFullName(); String syncID = ws.getSyncID(); log.println("P4: Polling on: " + nodeName + " with:" + client); // Set EXPANDED pinned label/change String pin = populate.getPin(); if (pin != null && !pin.isEmpty()) { pin = ws.getExpand().format(pin, false); ws.getExpand().set(ReviewProp.LABEL.toString(), pin); } // Calculate last change, build if null (JENKINS-40356) List<P4Ref> lastRefs = TagAction.getLastChange(lastRun, listener, syncID); if (lastRefs == null || lastRefs.isEmpty()) { return PollingResult.BUILD_NOW; } // Create task PollTask task = new PollTask(credential, lastRun, listener, filter, lastRefs); task.setWorkspace(ws); task.setLimit(pin); // Execute remote task incrementalChanges = buildWorkspace.act(task); // Report changes if (!incrementalChanges.isEmpty()) { return PollingResult.BUILD_NOW; } return PollingResult.NO_CHANGES; } /** * The checkout method is expected to check out modified files into the * project workspace. In Perforce terms a 'p4 sync' on the project's * workspace. Authorisation */ @Override public void checkout(Run<?, ?> run, Launcher launcher, FilePath buildWorkspace, TaskListener listener, File changelogFile, SCMRevisionState baseline) throws IOException, InterruptedException { PrintStream log = listener.getLogger(); boolean success = true; // Create task CheckoutTask task = new CheckoutTask(credential, run, listener, populate); // Get workspace used for the Task Workspace ws = task.setEnvironment(run, workspace, buildWorkspace); // Add review to environment, if defined if (review != null) { ws.addEnv(ReviewProp.REVIEW.toString(), review.getId()); ws.addEnv(ReviewProp.STATUS.toString(), CheckoutStatus.SHELVED.toString()); } // Set the Workspace and initialise task.setWorkspace(ws); task.initialise(); // Override build change if polling per change, MUST clear after use. if (isIncremental()) { task.setIncrementalChanges(incrementalChanges); } incrementalChanges = new ArrayList<P4Ref>(); // Add tagging action to build, enabling label support. TagAction tag = new TagAction(run, credential); tag.setWorkspace(ws); tag.setRefChanges(task.getSyncChange()); // JENKINS-37442: Make the log file name available tag.setChangelog(changelogFile); run.addAction(tag); // Invoke build. String node = ws.getExpand().get("NODE_NAME"); Job<?, ?> job = run.getParent(); if (run instanceof MatrixBuild) { parentChange = new P4LabelRef(getChangeNumber(tag, run)); if (isBuildParent(job)) { log.println("Building Parent on Node: " + node); success &= buildWorkspace.act(task); } else { listener.getLogger().println("Skipping Parent build..."); success = true; } } else { if (job instanceof MatrixProject) { if (parentChange != null) { log.println("Using parent change: " + parentChange); task.setBuildChange(parentChange); } log.println("Building Child on Node: " + node); } else { log.println("Building on Node: " + node); } success &= buildWorkspace.act(task); } // Abort if build failed if (!success) { String msg = "P4: Build failed"; logger.warning(msg); throw new AbortException(msg); } // Write change log if changeLogFile has been set. if (changelogFile != null) { // Calculate changes prior to build (based on last build) listener.getLogger().println("P4 Task: saving built changes."); List<P4ChangeEntry> changes = calculateChanges(run, task); P4ChangeSet.store(changelogFile, changes); listener.getLogger().println("... done\n"); } else { listener.getLogger().println("P4Task: unable to save changes, null changelogFile.\n"); } } // Get Matrix Execution options private MatrixExecutionStrategy getMatrixExecutionStrategy(Job<?, ?> job) { if (job instanceof MatrixProject) { MatrixProject matrixProj = (MatrixProject) job; return matrixProj.getExecutionStrategy(); } return null; } boolean isBuildParent(Job<?, ?> job) { MatrixExecutionStrategy matrix = getMatrixExecutionStrategy(job); if (matrix instanceof MatrixOptions) { return ((MatrixOptions) matrix).isBuildParent(); } else { // if user hasn't configured "Perforce: Matrix Options" execution // strategy, default to false return false; } } private List<P4ChangeEntry> calculateChanges(Run<?, ?> run, CheckoutTask task) { List<P4ChangeEntry> list = new ArrayList<P4ChangeEntry>(); // Look for all changes since the last (completed) build. // The lastBuild from getPreviousBuild() may be in progress or blocked. Run<?, ?> lastBuild = run.getPreviousCompletedBuild(); String syncID = task.getSyncID(); List<P4Ref> lastRefs = TagAction.getLastChange(lastBuild, task.getListener(), syncID); if (lastRefs != null && !lastRefs.isEmpty()) { list.addAll(task.getChangesFull(lastRefs)); } // if empty, look for shelves in current build. The latest change // will not get listed as 'p4 changes n,n' will return no change if (list.isEmpty()) { List<P4Ref> lastRevisions = new ArrayList<>(); lastRevisions.add(task.getBuildChange()); if (lastRevisions != null && !lastRevisions.isEmpty()) { list.addAll(task.getChangesFull(lastRevisions)); } } // still empty! No previous build, so add current if ((lastBuild == null) && list.isEmpty()) { list.add(task.getCurrentChange()); } return list; } // Pre Jenkins 2.60 @Override public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) { super.buildEnvVars(build, env); TagAction tagAction = TagAction.getLastAction(build); P4EnvironmentContributor.buildEnvironment(tagAction, env); } // Post Jenkins 2.60 JENKINS-37584 JENKINS-40885 public void buildEnvironment(Run<?, ?> run, Map<String, String> env) { TagAction tagAction = TagAction.getLastAction(run); P4EnvironmentContributor.buildEnvironment(tagAction, env); } private String getChangeNumber(TagAction tagAction, Run<?, ?> run) { List<P4Ref> builds = tagAction.getRefChanges(); for (P4Ref build : builds) { if (build instanceof P4ChangeRef) { // its a change, so return... return build.toString(); } if (build instanceof P4GraphRef) { continue; } try { // it is really a change number, so add change... int change = Integer.parseInt(build.toString()); return String.valueOf(change); } catch (NumberFormatException n) { // not a change number } ConnectionHelper p4 = new ConnectionHelper(run, credential, null); String name = build.toString(); try { Label label = p4.getLabel(name); String spec = label.getRevisionSpec(); if (spec != null && !spec.isEmpty()) { if (spec.startsWith("@")) { spec = spec.substring(1); } return spec; } else { // a label, but no RevisionSpec return name; } } catch (Exception e) { // not a label } try { String counter = p4.getCounter(name); if (!"0".equals(counter)) { try { // if a change number, add change... int change = Integer.parseInt(counter); return String.valueOf(change); } catch (NumberFormatException n) { // no change number in counter } } } catch (Exception e) { // not a counter } p4.disconnect(); return name; } return ""; } /** * The checkout method should, besides checking out the modified files, * write a changelog.xml file that contains the changes for a certain build. * The changelog.xml file is specific for each SCM implementation, and the * createChangeLogParser returns a parser that can parse the file and return * a ChangeLogSet. */ @Override public ChangeLogParser createChangeLogParser() { return new P4ChangeParser(credential); } /** * Called before a workspace is deleted on the given node, to provide SCM an * opportunity to perform clean up. */ @Override public boolean processWorkspaceBeforeDeletion(Job<?, ?> job, FilePath buildWorkspace, Node node) throws IOException, InterruptedException { logger.info("processWorkspaceBeforeDeletion"); Run<?, ?> run = job.getLastBuild(); if (run == null) { logger.warning("P4: No previous builds found"); return false; } // exit early if client workspace is undefined LogTaskListener listener = new LogTaskListener(logger, Level.INFO); EnvVars envVars = run.getEnvironment(listener); String client = envVars.get("P4_CLIENT"); if (client == null || client.isEmpty()) { logger.warning("P4: Unable to read P4_CLIENT"); return false; } // exit early if client workspace does not exist ConnectionHelper connection = new ConnectionHelper(run, credential, null); try { if (!connection.isClient(client)) { logger.warning("P4: client not found:" + client); return false; } } catch (Exception e) { logger.warning("P4: Not able to get connection"); return false; } // Setup Cleanup Task RemoveClientTask task = new RemoveClientTask(credential, job, listener); // Set workspace used for the Task Workspace ws = task.setEnvironment(run, workspace, buildWorkspace); task.setWorkspace(ws); boolean clean = buildWorkspace.act(task); logger.info("clean: " + clean); return clean; } @Override public DescriptorImpl getDescriptor() { return (DescriptorImpl) super.getDescriptor(); } /** * The relationship of Descriptor and SCM (the describable) is akin to class * and object. What this means is that the descriptor is used to create * instances of the describable. Usually the Descriptor is an internal class * in the SCM class named DescriptorImpl. The Descriptor should also contain * the global configuration options as fields, just like the SCM class * contains the configurations options for a job. * * @author pallen */ @Extension @Symbol("perforce") public static class DescriptorImpl extends SCMDescriptor<PerforceScm> { private boolean autoSave; private String credential; private String clientName; private String depotPath; private boolean autoSubmitOnChange; private boolean deleteClient; private boolean deleteFiles; private boolean hideTicket; private int maxFiles = DEFAULT_FILE_LIMIT; private int maxChanges = DEFAULT_CHANGE_LIMIT; public boolean isAutoSave() { return autoSave; } public String getCredential() { return credential; } public String getClientName() { return clientName; } public String getDepotPath() { return depotPath; } public boolean isAutoSubmitOnChange() { return autoSubmitOnChange; } public boolean isDeleteClient() { return deleteClient; } public boolean isDeleteFiles() { return deleteFiles; } public boolean isHideTicket() { return hideTicket; } public int getMaxFiles() { return maxFiles; } public int getMaxChanges() { return maxChanges; } /** * public no-argument constructor */ public DescriptorImpl() { super(PerforceScm.class, P4Browser.class); load(); } /** * Returns the name of the SCM, this is the name that will show up next * to CVS and Subversion when configuring a job. */ @Override public String getDisplayName() { return "Perforce Software"; } @Override public boolean isApplicable(Job project) { return true; } @Override public SCM newInstance(StaplerRequest req, JSONObject formData) throws FormException { PerforceScm scm = (PerforceScm) super.newInstance(req, formData); return scm; } /** * The configure method is invoked when the global configuration page is * submitted. In the method the data in the web form should be copied to * the Descriptor's fields. To persist the fields to the global * configuration XML file, the save() method must be called. Data is * defined in the global.jelly page. */ @Override public boolean configure(StaplerRequest req, JSONObject json) throws FormException { try { autoSave = json.getBoolean("autoSave"); credential = json.getString("credential"); clientName = json.getString("clientName"); depotPath = json.getString("depotPath"); autoSubmitOnChange = json.getBoolean("autoSubmitOnChange"); } catch (JSONException e) { logger.info("Unable to read Auto Version configuration."); autoSave = false; } try { deleteClient = json.getBoolean("deleteClient"); deleteFiles = json.getBoolean("deleteFiles"); } catch (JSONException e) { logger.info("Unable to read client cleanup configuration."); deleteClient = false; deleteFiles = false; } try { hideTicket = json.getBoolean("hideTicket"); } catch (JSONException e) { logger.info("Unable to read TICKET security configuration."); hideTicket = false; } try { maxFiles = json.getInt("maxFiles"); maxChanges = json.getInt("maxChanges"); } catch (JSONException e) { logger.info("Unable to read Max limits in configuration."); maxFiles = DEFAULT_FILE_LIMIT; maxChanges = DEFAULT_CHANGE_LIMIT; } save(); return true; } /** * Credentials list, a Jelly config method for a build job. * * @param project Jenkins project item * @param credential Perforce credential ID * @return A list of Perforce credential items to populate the jelly * Select list. */ public ListBoxModel doFillCredentialItems(@AncestorInPath Item project, @QueryParameter String credential) { return P4CredentialsImpl.doFillCredentialItems(project, credential); } /** * Credentials list, a Jelly config method for a build job. * * @param project Jenkins project item * @param value credential user input value * @return A list of Perforce credential items to populate the jelly * Select list. */ public FormValidation doCheckCredential(@AncestorInPath Item project, @QueryParameter String value) { return P4CredentialsImpl.doCheckCredential(project, value); } } /** * This methods determines if the SCM plugin can be used for polling */ @Override public boolean supportsPolling() { return true; } /** * This method should return true if the SCM requires a workspace for * polling. Perforce however can report submitted, pending and shelved * changes without needing a workspace */ @Override public boolean requiresWorkspaceForPolling() { return false; } /** * Incremental polling filter is set * * @return true if set */ private boolean isIncremental() { if (filter != null) { for (Filter f : filter) { if (f instanceof FilterPerChangeImpl) { if (((FilterPerChangeImpl) f).isPerChange()) { return true; } } } } return false; } }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#7 | 24112 | Paul Allen | Merging using p4-jenkins_main>dev | ||
#6 | 23951 | Paul Allen | Merging using p4-jenkins_main>dev | ||
#5 | 23950 | Paul Allen | Merging using p4-jenkins_main>dev | ||
#4 | 23691 | Paul Allen | Cleanup P4Task: Remove disconnect and use Closeable. | ||
#3 | 23686 | Paul Allen | Cleanup P4Task: Move setters into constructor. | ||
#2 | 23685 | Paul Allen | Copy main -> dev | ||
#1 | 20641 | Paul Allen | Copy main -> dev (jenkinsci/p4-plugin) | ||
//guest/perforce_software/p4jenkins/main/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java | |||||
#79 | 20226 | Paul Allen |
Support for Multiple SCMs Plugin. Optional dependency on multiple-scms and helper method for safely casting SCM object to PerforceSCM instance, especially in the scenario where the SCM object is a MultiSCM instance. JENKINS-32064 |
||
#78 | 20201 | Paul Allen | Moved set to null checked block. | ||
#77 | 20190 | Karl Wirth |
Expose HUDSON_CHANGELOG_FILE environment variable. JENKINS-37442 #p4karl |
||
#76 | 20179 | Paul Allen | Javadoc fixes for java 8 builds. | ||
#75 | 19890 | Paul Allen |
Set environment before removing workspace. Verify NPE with test case. JENKINS-36422 |
||
#74 | 19764 | Paul Allen | Simplify RemoveClientTask by using AbstractTask. | ||
#73 | 19612 | Paul Allen | Polling fix, if no previous build. | ||
#72 | 19593 | Paul Allen | More minor fixes to satisfy FindBugs Analysis. | ||
#71 | 19581 | Paul Allen | Minor fixes to satisfy FindBugs Analysis. | ||
#70 | 19574 | Paul Allen | Support for guessBrowser and getKey. | ||
#69 | 19516 | Paul Allen | Merge pull request #23 from Dohbedoh/JENKINS-29979 | ||
#68 | 19454 | Paul Allen |
Hide P4_TICKET for secure systems. An option in the global configuration to hide the P4_TICKET variable (not set by default). JENKINS-24591 |
||
#67 | 19374 | Paul Allen |
Poll on Master (without workspace) New Polling Filter ‘Poll on Master using Last Build’. Only polls on the master and fetches it change from the last Build. Note that 0 is assumed if no previous build is found. JENKINS-32814 |
||
#66 | 18440 | Paul Allen |
Prevent Delete actions on the Publish step. Limit reconcile to -ae (add/edit) JENKINS-28448 |
||
#65 | 18336 | Paul Allen |
Merge pull request #22 from ADTRAN/master Fix polling on workflow jobs. (JENKINS-29598) |
||
#64 | 18335 | Paul Allen |
Slave support for Clean Up Workspace. Will remove the client and/or versioned files. Other non versioned files are removed by Jenkins not the p4 plugin. Uncomment lines 67,68 in RemoveClientTask.java to fix Jenkins bug. JENKINS-24003 |
||
#63 | 17303 | Paul Allen |
Unsync Perforce versioned files on cleanup. Don’t rely on Jenkins to Delete Perforce versioned files as some OS ACLs can’t delete them. JENKINS-24003 |
||
#62 | 17263 | Paul Allen |
Added enable/disable option for auto versioning. Global option to activate Perforce versioning of Jenkins Configurations. |
||
#61 | 16836 | Paul Allen |
Versioning for Jenkins configuration pages. Add credential, depot path location and client workspace name, everything else should be automatic. JENKINS-25145 |
||
#60 | 16820 | Paul Allen |
Delete client workspace and files on a delete Jenkins Job Global Perforce options for delete files and/or delete client. JENKINS-32454 |
||
#59 | 16819 | Paul Allen |
Clear change-list cache after build (polling or build now). JENKINS-31862 |
||
#58 | 16815 | Paul Allen |
Enable early binding for CHARSET Expose CHARSET to AbstractTask to allow the charset to be set at the point the client workspace is set as current in ClientHelper. |
||
#57 | 16514 | Paul Allen |
Unshelve and resolve build step. Implements a classic Jenkins Build step (i.e. not Workflow). Must provide a shelf change number and resolve options. The shelf change number supports variable expansion ${VAR}. |
||
#56 | 15752 | Paul Allen |
Update workspace before parallel cloning. Parallel builds clone the workspace using a template, but the base workspace needs to save any changes before the clone. |
||
#55 | 15750 | Paul Allen |
Use a P4Revision object and not int/String as Object. In sure that there is no ambiguity with the revision specifier. Should fix change summary when using the Workflow plugin. JENKINS-30425 |
||
#54 | 15665 | Paul Allen |
Create a template workspace for parallel builds. If Jenkins attempts a parallel build it creates a workspace@2 directory. This change creates a new template workspace (appended with .clone2) and substitutes the `@` to `%40` in the root path. JENKINS-29387 |
||
#53 | 15663 | Paul Allen |
Added P4_USER and P4_TICKET environment variables. Added Perforce environment variables to the buildEnv documentation. JENKINS-24591 |
||
#52 | 15379 | Paul Allen |
Ground-work for Workflow-DSL (Split out Sven’s DSL changes to the core) @sven_erik_knop |
||
#51 | 15345 | Paul Allen |
Fixed issue with workflow-plugin when setting changelog to false. @niconorsk |
||
#50 | 14838 | Paul Allen |
Check if the workspace exists before cleanup. JENKINS-29030 |
||
#49 | 14779 | Paul Allen |
Add shelved changes to built changes list. JENKINS-25724 |
||
#48 | 14040 | Paul Allen | Delay polling if a build is in progress. | ||
#47 | 13777 | Paul Allen | (matthauck) Fix JENKINS-28726: Allow for default matrix execution strategy | ||
#46 | 13701 | Paul Allen |
Move Labelling into a Task. Logging improvements. |
||
#45 | 13681 | Paul Allen |
Abstracted Expand class from Workspace. Added support for Label variable expansion in the name and description. |
||
#44 | 12977 | Paul Allen | Quiet option for Populate. | ||
#43 | 12976 | Paul Allen | Improved logging to include 'actual' Perforce command. | ||
#42 | 12953 | Paul Allen |
Update logging to support expand/collapse divs. - Additional Publish logging |
||
#41 | 12932 | Paul Allen |
New Populate CheckOnly Implementation. No tidy or sync steps only a have list update. Intended for use with polling and triggering other Jenkins jobs. #review-12933 @mjoubert |
||
#40 | 12931 | Paul Allen |
#review-12907 @mjoubert Added P4PORT to env for command line calls. |
||
#39 | 12199 | Paul Allen |
Fix for change number on matrix builds. If the Matrix build was for a shelved change then the children would sync at the shelved change and not the submitted change. |
||
#38 | 11941 | Paul Allen |
Minor updates. Update credentials to 1.22 and remove old p4java snapshot repo. Includes name refactor (project -> job) |
||
#37 | 11626 | Paul Allen |
Workflow support. - Updated the plugin to the latest LTS Jenkins release 1.580.3. - Updated P4Java to 2014.1 Tested with simple ‘static’ workspace, there may be limitations with ‘manual’ workspace. Plan to add DSL support by extending the SCMStep class. #review-11537 JENKINS-24206 |
||
#36 | 11561 | Paul Allen |
Avoid writing `null` client root. Added protection to prevent a null client root value being written during polling. The client root is not set during polling as the workspace could be polled from another node. Change also prevents updates to Static workspaces. JENKINS-26589 |
||
#35 | 11531 | Paul Allen |
Resolve hostname on the remote slave. Avoid the Node object as resolving DNS on the remote host will be the same way as the Perforce Workspace. |
||
#34 | 11492 | Paul Allen | Minor Fix: first parent builds and label namespace | ||
#33 | 11475 | Paul Allen |
Build children at parent's change. The change calculated by the parent is passed to the children. This avoids change drift for long builds with delayed executors. |
||
#32 | 11472 | Paul Allen |
Pin the Workspace to the build host. Added a check box under the Workspace configuration to allow Jenkins to Pin the workspace, by setting the Host field. The hostname is resolved from the Computer object or InetAddress. |
||
#31 | 11460 | Paul Allen | Set the Host field in the client to NODE_NAME. | ||
#30 | 11451 | Paul Allen |
Fix for ${NODE_NAME} evaluation. Use Jesse Glick’s workspaceToNode() method to evaluate the Node given a FilePath object. |
||
#29 | 11367 | Paul Allen |
Fixes to Remote slave polling - Missing Serializable on Filter classes - Pass a list of changes using return |
||
#28 | 11335 | Paul Allen | Remote slave support for Polling. | ||
#27 | 11334 | Paul Allen |
Remote slave support for Publish Perforce Publish commands need to be executed from the remote slave. - Includes refactoring into task package |
||
#26 | 11269 | Paul Allen |
Poll parent if Matrix 'Build Parent' is set. If the 'Build Parent' option under Configuration Matrix' --> 'Execution Strategy' --> 'Perforce: Matrix options' is set then polling will only check the parent and not the children for changes. |
||
#25 | 11093 | Paul Allen | Trigger Swarm for pass/fail for multi builds. | ||
#24 | 11084 | Paul Allen |
(mjoubert) Fully populate changelog.xml Replaces sparse change log which only recorded the change number. The change is now recorded in full allowing faster page load times. The number of files listed in the change is limited to 50; to view larger changes please add a repo browser such as Swarm, Fisheye, P4Web, etc… |
||
#23 | 11034 | Paul Allen |
Set default for NODE_NAME. Builds on the master might not expand NODE_NAME leaving and empty string. |
||
#22 | 10942 | Paul Allen |
Set value for NODE_NAME for SCM Polling NODE_NAME is hard to calculate in the Polling step, so set the default to ‘master’. |
||
#21 | 10914 | Paul Allen |
SCM Polling Use client path syntax for listing have changes as using a windows path on a linux master will fail. Exit early from polling if a change is found. |
||
#20 | 10907 | Paul Allen |
Minor fixes for Parent builds. - Disable ‘*’ substitution (too dangerous on large systems). - Skip change calculation when skipping parent. |
||
#19 | 10906 | Paul Allen |
Matrix Polling and Parent control - Polling for Matrix builds calculates changes based on children. - Parent build disabled when using "Matrix options for Perforce" in the Matrix Configuration (can be enabled by checking the “Build parent” box). - Parent Build now substitutes ${var} with ‘*’ for the workspace view. e.g. //depot/${os}/… //ws/${os}/… becomes… //depot/*/… //ws/*/… instead of… //depot/os/… //ws/os/… |
||
#18 | 10899 | Paul Allen |
Prevent error when deleting unbuilt jobs. If a job has no previous build it could fail with a null pointer. JENKINS-25491 |
||
#17 | 10879 | Paul Allen |
Fix null formatTags in Workspace, by loading label from the cloned workspace. JENKINS-25596 |
||
#16 | 10854 | Paul Allen |
Clone Workspace Object Seems Jenkins makes re-entrant calls to the PerforceScm Object and caused the Workspace Object to get trampled. JENKINS-25547 |
||
#15 | 10841 | Paul Allen |
Support for 2014.1 reconcile by MODTIME Feature allows a user check the option ‘Sync with MODTIME for consistency check’ under the ‘Populate’ option to enable reconcile to check files based on MODTIME. Includes test case for MODTIME and minor fix for fetching a Label when there is no previous change. JENKINS-25341 |
||
#14 | 10802 | Paul Allen |
Test cases for SCM Polling Added test case for Polling with Limits (pinning) and Incremental. |
||
#13 | 10801 | Paul Allen |
Improvements to SCM Polling Moved change list calculation into a new class CheckoutChanges. Should enable normal build to build every thing and poll to follow polling behaviour: limit based on pin and per-change if set. JENKINS-25300 |
||
#12 | 10755 | Paul Allen |
Separate name space for 'label' parameter. Perforce Review endpoint added `label`, `change`, `status`, `pass`, and `fail` parameter into the environment, which is a shared name space. This clashed with the default `label` matrix name and causing users issues. The change prefixes the review parameters with `p4.` on addition to the environment. |
||
#11 | 10525 | Paul Allen |
Update Changelist calculation. Changed the SCM Polling and change listing reporting to calculate the last change based on the highest reported 'have' entry from 'p4 cstat' and then list using 'p4 changes'. JENKINS-24978 JENKINS-24607 |
||
#10 | 10084 | Paul Allen | Polling will trigger on 'cstat' OR 'sync -n'. | ||
#9 | 9990 | Paul Allen | Remove unnecessary setting of Root. | ||
#8 | 9984 | Paul Allen |
Set P4_CHANGELIST to change for Automatic Labels. P4_CHANGELIST is set to a change number or label if defined in Populate as pinned or a build parameter. |
||
#7 | 9980 | Paul Allen |
Changed error reporting to use AbortException. - Use direct access of scm attributes, not via build.getProject().getScm() - Improved logging around labels/changes. |
||
#6 | 9851 | Paul Allen | Merging using p4-jenkins | ||
#5 | 9819 | Paul Allen | Merging using p4-jenkins | ||
#4 | 9803 | Paul Allen | Merging using p4-jenkins | ||
#3 | 9769 | Paul Allen | Copying using p4-jenkins | ||
#2 | 9738 | Paul Allen | Merging using p4-jenkins | ||
#1 | 9690 | Paul Allen |
[Branching using p4-jenkins] Release 1.0.1 |
||
//guest/paul_allen/dev/p4-jenkins/p4-client/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java | |||||
#1 | 9672 | Paul Allen | Refactor name from 'p4_client' to 'p4'. | ||
//guest/paul_allen/dev/p4-jenkins/p4-client/src/main/java/org/jenkinsci/plugins/p4_client/PerforceScm.java | |||||
#32 | 9495 | Paul Allen |
Fix Polling issue; using the wrong client. Removed static classes and internal referenced to PerforceScm attributes, to avoid threading issues. |
||
#31 | 9472 | Paul Allen |
Added support to pin build at a label in the populate configuration. - includes help and updates to tests. |
||
#30 | 9430 | Paul Allen |
Polling SCM: skip filter check if no filters - added more logging for Polling errors. |
||
#29 | 9429 | Paul Allen |
Fix SCM Polling bug. Client workspace was not set (unless by an earlier build). - Move listChanges method to ClientHelper. |
||
#28 | 9115 | Paul Allen |
Initial implementation of workspace Cleanup and Sync options. - Includes 3 modes: Automatic Clean/Sync, Force Clean/Sync, Sync Only Automatic Clean/Sync Uses reconcile to clean up workspace and sync changes. Force Clean/Sync Force sync of all files (does not remove files yet...) Sync Only Normal sync with no cleanup TODO: - remove of files in Force Clean/Sync mode - Inline help - Update docs - Add unit/functional tests |
||
#27 | 9091 | Paul Allen |
Added Changelist build filtering for SCM polling: - Configuration uses 'repeatableHeteroProperty' - Filter on Perforce username - Filter on Perforce Depot path (no wildcard support) |
||
#26 | 9069 | Paul Allen |
Adding initial support for tagging Jenkins builds as Perforce Automatic Labels. Only implements TagAction (manual labels); TagNotifier and test cases TODO. |
||
#25 | 9055 | Paul Allen |
Label support. Build at a label using the pram 'label'. This includes adding the label to the ChangeEntry, building the change reports and Browser links to Swarm. (TPI-102) |
||
#24 | 9038 | Paul Allen |
Improved error messages for Form Validate field checks. Uses Perforce Server messages (TPI-80) |
||
#23 | 8969 | Paul Allen |
Adds all contributing change-lists for the build to the change log (using p4 cstat). - Includes exception logging for server connection to the Jenkins console. |
||
#22 | 8940 | Paul Allen |
Major refactor for the ConnectionHelper class to simplify serialisation. Fixed remote Jenkins JNLP slave connection issue. ClientHelper now extends ConnectionHelper and takes on all methods that require a client workspace. P4StandardCredentials is sent to the remote node instead of Credentials ID due to an issue accessing the Credentials store over a remote connection. For simplicity Client ID (workspace name) is serialised instead of the Workspace object. |
||
#21 | 8929 | Paul Allen |
Clean up doCheck Warnings on configuration page (TPI-80). - Added check exceptions to log as warnings. |
||
#20 | 8915 | Paul Allen |
Support for ChangeLog and RepoBrowser. - Added RepoBrowser for Swarm (porting the others should be easy) - ChangeLog XML file now only stores the changelist number all other information is fetched from Perforce |
||
#19 | 8771 | Paul Allen |
Perforce Server 12.1 min check for: Build configuration and password/ticket credentials. Includes: - Added logging for Perforce connections (fine) and set connection pool to 2. - Add 'none' to empty charset list (connection bug?) - Supress P4Java errors for syncing ubinary, xtext, unicode |
||
#18 | 8770 | Paul Allen |
Implemented SCM hook for when Jenkins deletes a workspace. The PerforceScm plugin deletes the workspace, but leaves Jenkins to clean up the local files and directories. (includes dummy 'p4 cstat' code for change reporting) |
||
#17 | 8762 | Paul Allen |
Console Ouptut logging for SCM build steps. - Removed SLF4J and used old style logger (matching Jenkins) - Set Client Host filed to null, Jenkins sometimes gives an IP address. - Test p4java setps in SCM tasks for success(true/false) |
||
#16 | 8744 | Paul Allen |
Support basic SCM Polling. When Jenkins has "Poll SCM" checked the Perforce SCM provider just runs a 'p4 sync -n' on the Workspace. Simple and Fast. |
||
#15 | 8738 | Paul Allen |
Workspace Name Formatter. For Template and Stream workspaces it allows the substitution of the following tags: ${node} The name given to the slave Jenkins node. ${hostname} The hostname for the slave Jenkins node. ${project} The name of the Jenkins build Job. ${hash} Unique hash code of the Jenkins node. |
||
#14 | 8737 | Paul Allen |
Added basic Help for SCM Configuration page. Tidy up descriptions and fix (null:null) in Credential summary. |
||
#13 | 8694 | Paul Allen | Added support for unshelve and revert -w behaviour for builds. | ||
#12 | 8688 | Paul Allen | (Work in progress) Able to call build from review Action and pass URL params. | ||
#11 | 8664 | Paul Allen | Simplified connection to Perforce to get around the SCM initilisation (or lack of). | ||
#10 | 8663 | Paul Allen | Rollout of charset for all Workspace modes. | ||
#9 | 8661 | Paul Allen | Workspace auto fill | ||
#8 | 8641 | Paul Allen | Added workspace helper (setClient) and template/stream types. | ||
#7 | 8640 | Paul Allen |
Added Workspace and Singleton descriptor. Removed old connection code. |
||
#6 | 8639 | Paul Allen |
Added hint URL to Credentials page when no Credentials are defined. Minor refactor and UX changes. |
||
#5 | 8629 | Paul Allen |
Added p4java with connection/authorisation helper classes. Included SSL support and detection of Unicode servers. |
||
#4 | 8613 | Paul Allen | Tidy up unused Credentials data and for debug added getId() to SelectList title. | ||
#3 | 8612 | Paul Allen | Job can now select and save/load Credential choice (some cleanup TODO) | ||
#2 | 8611 | Paul Allen | Basic implementation of Credentials Store | ||
#1 | 8598 | Paul Allen | Experimentation with data binding for Jelly files and ExtensionPoint/Descriptor |