Merge pull request #337 from kmanning/issue_331

Issue 331: terraform-pipeline should not fail if DockerPipeline plugin not installed

Author: kmanning

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 
+* [Issue #331](https://github.com/manheim/terraform-pipeline/issues/331) Bug Fix: terraform-pipeline should be usable even if Docker-Pipeline-plugin is not installed (and Docker featuers are not used)
 * [Issue #335](https://github.com/manheim/terraform-pipeline/issues/335) Testing: Rename DummyJenkinsfile to MockWorkflowScript to better distinguish Jenkinsfile references.
 * [Issue #271](https://github.com/manheim/terraform-pipeline/issues/271) Testing: Cleanup Test resets for any static state.  New Resettable and ResetStaticStateExtension available.
 * [Issue #332](https://github.com/manheim/terraform-pipeline/issues/332) Upgrade from Junit 4 to 5.7, upgrade hamcrest from 1.3 to 2.2, remove junit-hierarchicalcontextrunner dependency

src/Jenkinsfile.groovy

@@ -1,6 +1,5 @@
 class Jenkinsfile implements Resettable {
     public static original
-    public static docker
     public static defaultNodeName
     public static repoSlug = null
     public static instance = new Jenkinsfile()
@@ -56,7 +55,6 @@ class Jenkinsfile implements Resettable {
 
     def static void init(original, Class customizations=null) {
         this.original = original
-        this.docker   = original.docker
 
         initializeDefaultPlugins()
 
@@ -134,7 +132,6 @@ class Jenkinsfile implements Resettable {
         instance = new Jenkinsfile()
         original = null
         defaultNodeName = null
-        docker = null
         pipelineTemplate = null
         declarative = false
     }

test/AgentNodePluginTest.groovy

@@ -125,7 +125,6 @@ class AgentNodePluginTest {
                 AgentNodePlugin.withAgentDockerImageOptions(expectedOptions)
                 def plugin = new AgentNodePlugin()
                 def original = createOriginalSpy()
-                original.docker = original
 
                 def agentClosure = plugin.addAgent()
                 agentClosure.delegate = original