Test Automation: Add Jenkins Pipeline Unit to the repository #93

v1v · 2019-06-12T21:52:20Z

This PR is just a PoC using the https://github.com/jenkinsci/JenkinsPipelineUnit for the vars/infra.groovy steps.

Highlights

UTs based on https://github.com/jenkinsci/JenkinsPipelineUnit
Jenkinsfile to test the shared library

Tasks

Agree whether to move forward with the rest of steps.
Ask for MB in ci.jenkins.io #INFRA-2147

Proposed

Create simple vars/steps for the methods within the vars/infra.groovy to simplify the UTs and the maintenance in the future.

oleg-nenashev · 2019-06-12T21:53:53Z

Needs an INFRA ticket to get Pipeline enabled for the repo. But thanks a lot!

…blob/master/scripted-pipeline/src/main/resources/archetype-resources/pom.xml

…hetypes/blob/master/scripted-pipeline/src/main/resources/archetype-resources/pom.xml" This reverts commit 05349d1.

…nsci/archetypes/blob/master/scripted-pipeline/src/main/resources/archetype-resources/pom.xml"" This reverts commit fe20103.

oleg-nenashev

Looks good to me. If we want to verify it, ci.jenkins.io-runner should be able to execute this pipeline

v1v · 2019-06-17T08:07:38Z

I already tried with the ci.jenkins.io-runner project but I was not able to use the declarative pipeline out of the box but the scripted pipeline to test the Jenkinsfile. It seems there are some clash dependencies when running the jenkins-runner. So, I haven't tried to solve them locally yet, not sure if someone else could potentially give a go. My master branch is now based on this PR: https://github.com/v1v/pipeline-library/ in case someone would like to try the ci.jenkins.io-runner locally and easily.

oleg-nenashev · 2019-06-17T08:14:10Z

I already tried with the ci.jenkins.io-runner project but I was not able

to use the declarative pipeline out of the box but the scripted pipeline to test the Jenkinsfile. It seems there are some clash dependencies when running the jenkins-runne Please report an issue so that I can take a look, thanks!

…

On Mon, Jun 17, 2019 at 10:07 AM Victor Martinez ***@***.***> wrote: I already tried with the ci.jenkins.io-runner project but I was not able to use the declarative pipeline out of the box but the scripted pipeline to test the Jenkinsfile. It seems there are some clash dependencies when running the jenkins-runner. So, I haven't tried to solve them locally yet, not sure if someone else could potentially give a go. My master branch is now based on this PR: https://github.com/v1v/pipeline-library/ in case someone would like to try the ci.jenkins.io-runner locally and easily. — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#93?email_source=notifications&email_token=AAW4RIDP65536DRECKI3DYLP25A4XA5CNFSM4HXS3LQKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODX2L5YI#issuecomment-502578913>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAW4RIHEI6VU3BTJBF4ZENDP25A4XANCNFSM4HXS3LQA> .

…kerCredentialsOutsideInfra implementation as it does use the env variables

jglick

I guess we will see if this is helpful in preventing real regressions or not.

Jenkinsfile

jglick · 2019-07-01T14:20:58Z

Jenkinsfile

+        }
+        stage('Test') {
+            steps {
+                sh 'mvn clean test'


At least add -B; also -ntp after INFRA-2129.

I'll leave the -ntp flag as a future change until that version of maven has not been updated in the infra side.

Jenkinsfile

jglick · 2019-07-01T14:22:21Z

pom.xml

+            <plugin>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-eclipse-compiler</artifactId>
+                <version>2.9.2-01</version>


BTW there were some recent changes to the archetype here.

After picking up the latest changes:

875e54b

The test goal didn't execute anything and I managed to find implicit version changed of the surefire.

So I had to enforce the version as the previous one:

ba1396a

Not sure whether that's the expected behaviour in the archetype but with the latest commit everything seems to be back to business.

…e mvn goals and use the default surefire pattern

….12.4:test' by default with the latest changes

batmat

👍 🎆

batmat · 2019-07-06T20:56:52Z

Added a basic test locally for testing #94, this already allows at least to catch compilation errors and so on, which is already a thing. So 👍

import com.lesfurets.jenkins.unit.BasePipelineTest
import org.junit.Before
import org.junit.Test
import org.yaml.snakeyaml.Yaml
import static com.lesfurets.jenkins.unit.MethodCall.callArgsToString
import static org.junit.Assert.assertTrue

class BuildPluginStepTests extends BasePipelineTest {
  static final String scriptName = 'vars/buildPlugin.groovy'
  Map env = [:]



  /**
   * Mock Infra step
   */
  class Infra implements Serializable {
    public String retrieveMavenSettingsFile(String location) { return location }
    public String runWithMaven(String cmd) { return cmd }
    public String runMaven(mvn, jdk, foo, settings) { return 'OK' }
  }

  @Override
  @Before
  void setUp() throws Exception {
    super.setUp()

    binding.setProperty('infra', new Infra())
    binding.setVariable('env', env)

    helper.registerAllowedMethod('archiveArtifacts', [Map.class], { m -> m })
    helper.registerAllowedMethod('echo', [String.class], { s -> s })
    helper.registerAllowedMethod('error', [String.class], {s ->
      updateBuildStatus('FAILURE')
      throw new Exception(s)
    })
    helper.registerAllowedMethod('findFiles', [Map.class], { String[] files = ["bom.yml", "d1/bom.yml"] })
    helper.registerAllowedMethod('pwd', [], { '/foo' })
    helper.registerAllowedMethod('pwd', [Map.class], { '/bar' })
    helper.registerAllowedMethod('readYaml', [Map.class], {
      Yaml yaml = new Yaml()
      return yaml.load(default_config_metadata)
    })
    helper.registerAllowedMethod('sh', [String.class], { s -> s })
    helper.registerAllowedMethod('writeYaml', [Map.class], { })
  }

  @Test
  void test_loading() throws Exception {
    def script = loadScript(scriptName)
  }
}

batmat · 2019-07-06T20:58:43Z

@rtyler That would be great if you can look into https://issues.jenkins-ci.org/browse/INFRA-2147 so the library can start being tested itself. Thanks!

v1v · 2019-08-01T19:46:17Z

@rtyler sorry for asking you here directly here, I already asked twice in the infra mailing list about it, this PR is a kind of blocked as long as https://issues.jenkins-ci.org/browse/INFRA-2147 is not done. Are there any other requirements needed to be done before working on the above task?
Thanks

oleg-nenashev · 2019-08-02T14:09:53Z

I pinged in chats. It looks @batmat did the same today.
Let's use #jenkins-infra for sync-up if needed

rtyler

@v1v please accept the suggestions and then let's merge this and see how it works!

rtyler · 2019-08-05T12:58:34Z

Jenkinsfile

@@ -0,0 +1,25 @@
+#!/usr/bin/env groovy
+pipeline {
+    agent {


I think this can just work on the "maven" label, and use the Azure Container Instance agents which would be much faster.

Jenkinsfile

Co-Authored-By: R. Tyler Croy <rtyler@brokenco.de>

v1v · 2019-08-06T06:55:44Z

Done, please feel free to merge it, I just double check locally that mvn clean test works fine after merging with master.

oleg-nenashev

I think it is pretty good as is., but bonus points for ACI

oleg-nenashev · 2019-08-12T15:07:34Z

Jenkinsfile

@@ -0,0 +1,25 @@
+#!/usr/bin/env groovy
+pipeline {
+    agent {


oleg-nenashev · 2019-08-13T13:48:48Z

A bit YOLO, but 🚢 🇮🇹

oleg-nenashev · 2019-08-13T13:50:23Z

[2019-08-13T13:49:06.297Z] org.codehaus.groovy.control.MultipleCompilationErrorsException: startup failed:
[2019-08-13T13:49:06.297Z] WorkflowScript: 6: No tools specified @ line 6, column 5.
[2019-08-13T13:49:06.297Z]        tools {

feature: enable jenkins-pipeline-unit

802f4f4

oleg-nenashev self-requested a review June 12, 2019 21:53

kuisathaverat approved these changes Jun 13, 2019

View reviewed changes

v1v added 4 commits June 13, 2019 12:04

Simplify POM as stated here: https://github.com/jenkinsci/archetypes/…

05349d1

…blob/master/scripted-pipeline/src/main/resources/archetype-resources/pom.xml

Revert "Simplify POM as stated here: https://github.com/jenkinsci/arc…

fe20103

…hetypes/blob/master/scripted-pipeline/src/main/resources/archetype-resources/pom.xml" This reverts commit 05349d1.

UTs for the publishReports step

1d6af83

Revert "Revert "Simplify POM as stated here: https://github.com/jenki…

d47a39f

…nsci/archetypes/blob/master/scripted-pipeline/src/main/resources/archetype-resources/pom.xml"" This reverts commit fe20103.

oleg-nenashev approved these changes Jun 15, 2019

View reviewed changes

v1v added 4 commits June 17, 2019 22:34

Remove println as it's not required and finish the UT for testWithDoc…

6f60756

…kerCredentialsOutsideInfra implementation as it does use the env variables

UTs for the essentialsTest step

d49d456

Remove unnecessary debug traces

2d35faf

UTs for the CustomWarPackage step: it does cover some basic use cases

b25f101

jglick reviewed Jul 1, 2019

View reviewed changes

v1v added 3 commits July 2, 2019 21:05

As suggested: removed duplicated checkout, background execution of th…

57b4a70

…e mvn goals and use the default surefire pattern

use the latest archetype

875e54b

Let's force the version 3.0.0 as it does use 'maven-surefire-plugin:2…

ba1396a

….12.4:test' by default with the latest changes

batmat approved these changes Jul 6, 2019

View reviewed changes

oleg-nenashev mentioned this pull request Jul 31, 2019

Fix issues with previous PR for ACI #96

Merged

Merge remote-tracking branch 'upstream/master' into feature/test

5c484e5

rtyler approved these changes Aug 5, 2019

View reviewed changes

Apply suggestions from code review

6c992e1

Co-Authored-By: R. Tyler Croy <rtyler@brokenco.de>

oleg-nenashev approved these changes Aug 12, 2019

View reviewed changes

Jenkinsfile

@@ -0,0 +1,25 @@

#!/usr/bin/env groovy

pipeline {

agent {

Copy link

Contributor

oleg-nenashev Aug 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for ACI

oleg-nenashev added the chore label Aug 13, 2019

oleg-nenashev changed the title ~~PROPOSAL: enable jenkins-pipeline-unit~~ Add Jenkins Pipeline Unit to the repository Aug 13, 2019

oleg-nenashev merged commit ef17729 into jenkins-infra:master Aug 13, 2019

oleg-nenashev changed the title ~~Add Jenkins Pipeline Unit to the repository~~ Test Automation: Add Jenkins Pipeline Unit to the repository Aug 13, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Test Automation: Add Jenkins Pipeline Unit to the repository #93

Test Automation: Add Jenkins Pipeline Unit to the repository #93

v1v commented Jun 12, 2019 •

edited

oleg-nenashev commented Jun 12, 2019

oleg-nenashev left a comment

v1v commented Jun 17, 2019

oleg-nenashev commented Jun 17, 2019 via email

jglick left a comment

jglick Jul 1, 2019

v1v Jul 2, 2019

jglick Jul 1, 2019

v1v Jul 2, 2019

batmat left a comment

batmat commented Jul 6, 2019 •

edited

batmat commented Jul 6, 2019

v1v commented Aug 1, 2019

oleg-nenashev commented Aug 2, 2019

rtyler left a comment

rtyler Aug 5, 2019

oleg-nenashev Aug 12, 2019

v1v commented Aug 6, 2019 •

edited

oleg-nenashev left a comment

oleg-nenashev Aug 12, 2019

oleg-nenashev commented Aug 13, 2019

oleg-nenashev commented Aug 13, 2019

Test Automation: Add Jenkins Pipeline Unit to the repository #93

Test Automation: Add Jenkins Pipeline Unit to the repository #93

Conversation

v1v commented Jun 12, 2019 • edited

Highlights

Tasks

Proposed

oleg-nenashev commented Jun 12, 2019

oleg-nenashev left a comment

Choose a reason for hiding this comment

v1v commented Jun 17, 2019

oleg-nenashev commented Jun 17, 2019 via email

jglick left a comment

Choose a reason for hiding this comment

jglick Jul 1, 2019

Choose a reason for hiding this comment

v1v Jul 2, 2019

Choose a reason for hiding this comment

jglick Jul 1, 2019

Choose a reason for hiding this comment

v1v Jul 2, 2019

Choose a reason for hiding this comment

batmat left a comment

Choose a reason for hiding this comment

batmat commented Jul 6, 2019 • edited

batmat commented Jul 6, 2019

v1v commented Aug 1, 2019

oleg-nenashev commented Aug 2, 2019

rtyler left a comment

Choose a reason for hiding this comment

rtyler Aug 5, 2019

Choose a reason for hiding this comment

oleg-nenashev Aug 12, 2019

Choose a reason for hiding this comment

v1v commented Aug 6, 2019 • edited

oleg-nenashev left a comment

Choose a reason for hiding this comment

oleg-nenashev Aug 12, 2019

Choose a reason for hiding this comment

oleg-nenashev commented Aug 13, 2019

oleg-nenashev commented Aug 13, 2019

v1v commented Jun 12, 2019 •

edited

batmat commented Jul 6, 2019 •

edited

v1v commented Aug 6, 2019 •

edited