Add Pipeline support && generic update by oleg-nenashev · Pull Request #2 · jenkinsci/filesystem_scm-plugin

oleg-nenashev · 2017-01-02T00:01:52Z

I'm working on a pet project, which involves automation for Jenkins Pipeline based on libs. I need to test libs without committing changes, hence I decided to use Filesystem SCM plugin for such purpose. The plugin was very outdated (last release - 2011), hence there is a bunch of changes

Upgrade to the new Parent POM
Upgrade to the new core baseline (1.642.x)
Rework of the UI to use DataBound constructor (see screenshot of the changes)
Fixes of issues reported by FindBugs/Functional tests
Update SCM API to support Jobs/Runs
Delete button for the excludes/includes list

After the changes the plugin supports the scm step and can be used as a Library SCM source. Functional tests will be added later if original maintainers +1 the approach (CC @kohsuke, @samngms and @kutzi )

Old Config UI:

New config UI:

@reviewbybees

It was generally broken even ib the original branch.

Also changes the data structure and layout

ghost · 2017-01-02T00:04:04Z

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

jglick · 2017-01-05T18:31:39Z

I need to test libs without committing changes, hence I decided to use Filesystem SCM plugin for such purpose.

Why not just use Replay?

oleg-nenashev · 2017-01-05T18:34:12Z

Why not just use Replay?

How it can help with Libraries? From what I see I will have to commit/push them every time. Not thet comfortable for the local development.

jglick · 2017-01-06T21:45:25Z

Why not just use Replay?

How it can help with Libraries? From what I see I will have to commit/push them every time.

No, at least for untrusted libraries you can replay library changes as well as main script or loaded script changes. For example, try

make -C workflow-aggregator-plugin/demo run

BerndPfaff · 2017-04-11T16:01:45Z

I used this snapshot in a Jenkins pipeline job. At first it was working as expected.
After that I tried to change the configuration of this job in the UI. But the SCM part of the pipeline configuration was changed to a different scm tool (e.g. CVS). It was also not possible to select "File System" as SCM tool anymore, even some other options were not available anymore in the drop-down menu.
Only after the configuration Pipeline Definitions was saved as "Pipeline script", instead of "Pipeline script from SCM", it was possible to change the configuration back as "Pipeline script from SCM" File System.
Is this a known issue?

oleg-nenashev · 2017-04-11T16:04:22Z

@BerndPfaff Nope, it is not. Will try to reproduce once I find some time to finish this pull request

oleg-nenashev · 2017-05-30T07:55:26Z

Retriggering CI

niothiel · 2017-05-31T22:29:51Z

👍 Would love to see this update. We are doing something very similar and this looks immensely helpful.

oleg-nenashev · 2017-06-12T13:30:26Z

I hope to finalize it soon

oleg-nenashev · 2017-07-04T15:19:44Z

@reviewbybees back to review.

jglick · 2017-07-05T15:41:21Z

+  <licenses>
+    <license>
+      <name>MIT License</name>
+      <url>http://www.opensource.org/licenses/mit-license.php</url>


or just https://opensource.org/licenses/MIT

Does Netbeans already autoresolve it?

Yes I think so.

jglick · 2017-07-05T15:42:03Z

    <dependencies>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins.workflow</groupId>
+        <artifactId>workflow-aggregator</artifactId>


Do not use this plugin as a dependency even for tests. Specify workflow-cps, workflow-job, and any step plugins you need.

jglick · 2017-07-05T15:42:32Z

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.


jglick · 2017-07-05T15:42:43Z

+ */
+public class PipelineLibraryTest {
+
+}


jglick · 2017-07-05T15:43:19Z

+        <version>2.4</version>
+        <scope>test</scope>
+      </dependency>
+      <!-- Transient upper bound dependencies -->


Transitive?

jglick · 2017-07-05T15:54:03Z

+import jenkins.SlaveToMasterFileCallable;

-public class RemoteCopyDir implements FileCallable<Boolean> {
+public class RemoteCopyDir extends SlaveToMasterFileCallable<Boolean> {


Probably also wrong, though the class appears unused anyway so maybe just delete it.

jglick · 2017-07-05T16:00:19Z

 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
+import jenkins.security.SlaveToMasterCallable;


unused import

jglick · 2017-07-05T16:02:23Z

 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:entry title="Path" help="/plugin/filesystem_scm/help-path.html">
-    <f:textbox name="fs_scm.path" value="${scm.path}" />
+  <f:entry title="Path" field="path" help="/plugin/filesystem_scm/help-path.html">


Move help file to this folder and help need not be specified.

It came from the old structure. I would prefer to refactor it later

jglick · 2017-07-05T16:02:28Z

  </f:entry>
-  <f:entry title="Clear Workspace" help="/plugin/filesystem_scm/help-clearWorkspace.html">
-    <f:checkbox name="fs_scm.clearWorkspace" checked="${scm.clearWorkspace}"/>
+  <f:entry title="Clear Workspace" field="clearWorkspace" help="/plugin/filesystem_scm/help-clearWorkspace.html">


jglick · 2017-07-05T16:02:36Z

-        </f:block>
-      </f:optionalBlock>
-    </table>
+  <f:entry title="Copy Hidden Files/Folders" field="copyHidden" help="/plugin/filesystem_scm/help-copyHidden.html">


jglick · 2017-07-17T18:52:39Z

 	}

    @Extension
+    @Symbol("fsscm")


Should not include the scm. Maybe just filesystem?

jglick · 2017-07-17T18:52:51Z

+
+    @Override
+    public boolean requiresWorkspaceForPolling() {
+        return super.requiresWorkspaceForPolling(); //To change body of generated methods, choose Tools | Templates.


jglick · 2017-07-17T18:53:14Z


-public class RemoteCopyDir extends SlaveToMasterFileCallable<Boolean> {
+/**
+ * @deprecated Not used anymore


So just delete it.

Breaks binary compatibility. I do not want to touch it for now

jglick · 2017-07-17T18:53:49Z

+        // Init repo
+     //   File fsscmDir = tmpDir.newFolder("fsscm");
+    //    File jenkinsfile = new File(fsscmDir, "Jenkinsfile");
+    //    FileUtils.write(jenkinsfile, "echo `Hello, world!`");


Why commented out?

The test is still the mess

Blockers fixed. Tests still look incomplete.

oleg-nenashev · 2017-07-17T23:47:29Z

OK, now the test just hangs

oleg-nenashev · 2017-07-23T10:19:07Z

@jglick @niothiel @BerndPfaff I have released the current state as alpha-1. It should become available in the experimental UC soon. I will test it more before the release, especially the case from @BerndPfaff though I was unable to reproduce it.

tanandy · 2017-08-24T08:03:29Z

i got the same problem as @BerndPfaff

docker run --rm --name ci-jenkins-io-dev -v maven-repo:/home/xxx/test_demo/.m2 -v /home/xxx/shared-lib:/var/jenkins_home/pipeline-library -e DEV_HOST=${CURRENT_HOST} -p 8080:8080 -p 50000:50000 -e "JAVA_OPTS=-Dhttp.proxyHost=xxx -Dhttp.proxyPort=3128" -e "http_proxy=xxx" -e "https_proxy=xxx" onenashev/demo-jenkins-config-as-code

i create new pipeline job foo and put a wrong path into fspath then save (as admin:admin)
FS SCM disappear

oleg-nenashev · 2017-08-24T10:52:43Z

@tanandy Ack, I will double check it once I get back to the plugin

oleg-nenashev · 2017-12-06T10:11:13Z

@tanandy @BerndPfaff Fixed that stupid issue in the code and released alpha-2. Sorry, was working on other things and this slipped down the priority list

tanandy · 2017-12-06T11:45:05Z

@oleg-nenashev thanks a lot 👍

maloups · 2017-12-06T13:42:58Z

It works perfectly! :)
Thank you very much!

oleg-nenashev · 2017-12-06T20:41:02Z

I asked @jglick, he is fine with merging. I am about releasing it tomorrow. CC @abayer @svanoort just in case they have any comments/concerns.

svanoort · 2017-12-06T20:43:41Z

I probably won't be able to review before then.

oleg-nenashev · 2017-12-06T20:47:23Z

@svanoort just let me know if you want to review it. I can wait with release till Friday EoBD in your timezone. You know, conference-driven development :)

oleg-nenashev · 2017-12-08T09:36:43Z

🚢 🇮🇹

oleg-nenashev · 2017-12-08T09:39:09Z

I will not bump the version to 2.0, there is no significant compat breakages

oleg-nenashev · 2017-12-08T09:45:21Z

Well, I changed my mind after some consideration. In the worst case I will introduce 3.0 if I ever implement the SCM API

oleg-nenashev · 2017-12-08T18:16:14Z

Oh well, better to be on the safe side OTOH

oleg-nenashev added 10 commits January 1, 2017 19:40

Update Maven Parent POM to the latest version

f73a403

Fix Javadoc errors

4c8b0ff

Escape Jelly files by default

e6aa1f3

Use MasterToSlaveFileCallable in remote operations

0118dbc

Fix the broken environment-specific test

c6d7cfd

It was generally broken even ib the original branch.

Fix FindBugs warnings

d78ebf1

Update dependencies for testing with the last Pipeline version

6395d78

Add MIT Licence declaration to the POM.xml

85bbc99

Rework settings to make the plugin compatible with DataBoundConstructor.

4bce27e

Also changes the data structure and layout

Update plugin SCM API to make it compatible with Pipeline

c5290e4

oleg-nenashev requested a review from jglick January 5, 2017 18:27

jglick self-assigned this Jan 5, 2017

jglick removed their request for review February 6, 2017 18:48

jglick removed their assignment Feb 6, 2017

oleg-nenashev mentioned this pull request Feb 28, 2017

Add Jenkinsfile to the repo jenkinsci/windows-slave-installer-module#7

Merged

oleg-nenashev self-assigned this May 3, 2017

oleg-nenashev added the work-in-progress label May 3, 2017

oleg-nenashev closed this May 30, 2017

oleg-nenashev reopened this May 30, 2017

oleg-nenashev added 2 commits July 4, 2017 16:22

Update Parent POM to 2.32

4693fa0

Add “Delete” button to the repeatableProperty

b336d13

oleg-nenashev removed the work-in-progress label Jul 4, 2017

rsandell self-requested a review July 4, 2017 15:35

jglick previously requested changes Jul 5, 2017

View reviewed changes

Address comments from @jglick

74fd64c

jglick reviewed Jul 17, 2017

View reviewed changes

oleg-nenashev added 2 commits July 17, 2017 21:42

Make the code buildable, ignore the test for a while

b730e12

Recover the test to run it in CI

04e987c

oleg-nenashev added 2 commits July 23, 2017 12:56

Rename Symbol to filesystem

a3d50b6

Disable the hanging test

948d746

oleg-nenashev added 2 commits December 6, 2017 12:49

Refactor help files

76a43c9

The configuration does not longer dissapear from Web UI on instances

0b98b1a

oleg-nenashev merged commit ba9dad6 into jenkinsci:master Dec 8, 2017

Uh oh!

Conversation

oleg-nenashev commented Jan 2, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Jan 2, 2017

Uh oh!

jglick commented Jan 5, 2017

Uh oh!

oleg-nenashev commented Jan 5, 2017

Uh oh!

jglick commented Jan 6, 2017

Uh oh!

BerndPfaff commented Apr 11, 2017

Uh oh!

oleg-nenashev commented Apr 11, 2017

Uh oh!

oleg-nenashev commented May 30, 2017

Uh oh!

niothiel commented May 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oleg-nenashev commented Jun 12, 2017

Uh oh!

oleg-nenashev commented Jul 4, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

oleg-nenashev commented Jul 17, 2017

Uh oh!

oleg-nenashev commented Jul 23, 2017

Uh oh!

tanandy commented Aug 24, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oleg-nenashev commented Aug 24, 2017

Uh oh!

oleg-nenashev commented Dec 6, 2017

Uh oh!

tanandy commented Dec 6, 2017

Uh oh!

maloups commented Dec 6, 2017

Uh oh!

oleg-nenashev commented Dec 6, 2017

oleg-nenashev commented Jan 2, 2017 •

edited

Loading

niothiel commented May 31, 2017 •

edited

Loading

tanandy commented Aug 24, 2017 •

edited

Loading