We don't actually need port mapping in the docker tests. So stop.

abayer · abayer · commit c85dd7b00866 · 2018-03-29T11:09:23.000-04:00
diff --git a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AgentTest.java b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AgentTest.java
@@ -81,7 +81,7 @@ public void noCheckoutScmInWrongContext() throws Exception {
 
     @Test
     public void agentDocker() throws Exception {
-        agentDocker("agentDocker", "-v /tmp:/tmp -p 80:80");
+        agentDocker("agentDocker", "-v /tmp:/tmp");
     }
 
     @Test
@@ -198,7 +198,7 @@ public void fromDockerfile() throws Exception {
         expect("fromDockerfile")
                 .logContains("[Pipeline] { (foo)",
                         "The answer is 42",
-                        "-v /tmp:/tmp -p 8000:8000",
+                        "-v /tmp:/tmp",
                         "HI THERE")
                 .go();
     }
@@ -215,7 +215,7 @@ public void additionalDockerBuildArgs() throws Exception {
         expect("additionalDockerBuildArgs")
                 .logContains("[Pipeline] { (foo)",
                         "The answer is 42",
-                        "-v /tmp:/tmp -p 8000:8000",
+                        "-v /tmp:/tmp",
                         "hi there, thisOtherArg")
                 .logNotContains("hi there, thisArgHere")
                 .go();
@@ -234,7 +234,7 @@ public void fromDockerfileInOtherDir() throws Exception {
         expect("fromDockerfileInOtherDir")
                 .logContains("[Pipeline] { (foo)",
                         "The answer is 42",
-                        "-v /tmp:/tmp -p 8000:8000",
+                        "-v /tmp:/tmp",
                         "HI THERE")
                 .go();
     }
@@ -252,7 +252,7 @@ public void dirSepInDockerfileName() throws Exception {
         expect("fromDockerfileInOtherDir")
                 .logContains("[Pipeline] { (foo)",
                         "The answer is 42",
-                        "-v /tmp:/tmp -p 8000:8000",
+                        "-v /tmp:/tmp",
                         "HI THERE")
                 .go();
     }
@@ -284,7 +284,7 @@ public void fromAlternateDockerfile() throws Exception {
         expect("fromAlternateDockerfile")
                 .logContains("[Pipeline] { (foo)",
                         "The answer is 42",
-                        "-v /tmp:/tmp -p 8000:8000",
+                        "-v /tmp:/tmp",
                         "HI THERE")
                 .go();
     }
@@ -324,7 +324,7 @@ public void dockerPullLocalImage() throws Exception {
         expect("dockerPullLocalImage")
                 .logContains("[Pipeline] { (in built image)",
                         "The answer is 42",
-                        "-v /tmp:/tmp -p 8000:8000",
+                        "-v /tmp:/tmp",
                         "HI THERE",
                         "Maven home: /usr/share/maven")
                 .go();
diff --git a/pipeline-model-definition/src/test/resources/additionalDockerBuildArgs.groovy b/pipeline-model-definition/src/test/resources/additionalDockerBuildArgs.groovy
@@ -25,7 +25,7 @@
 pipeline {
     agent {
         dockerfile {
-            args "-v /tmp:/tmp -p 8000:8000"
+            args "-v /tmp:/tmp"
             additionalBuildArgs "--build-arg someArg=thisOtherArg"
         }
     }
diff --git a/pipeline-model-definition/src/test/resources/agentDocker.groovy b/pipeline-model-definition/src/test/resources/agentDocker.groovy
@@ -26,7 +26,7 @@ pipeline {
     agent {
         docker {
             image "httpd:2.4.12"
-            args "-v /tmp:/tmp -p 80:80"
+            args "-v /tmp:/tmp"
         }
     }
     stages {
diff --git a/pipeline-model-definition/src/test/resources/agentDockerEnvSpecLabel.groovy b/pipeline-model-definition/src/test/resources/agentDockerEnvSpecLabel.groovy
@@ -31,7 +31,7 @@ pipeline {
         docker {
             label "thisspec"
             image "httpd:2.4.12"
-            args "-v /tmp:/tmp -p 80:80"
+            args "-v /tmp:/tmp"
         }
     }
     stages {
diff --git a/pipeline-model-definition/src/test/resources/agentDockerEnvTest.groovy b/pipeline-model-definition/src/test/resources/agentDockerEnvTest.groovy
@@ -30,7 +30,7 @@ pipeline {
     agent {
         docker {
             image "httpd:2.4.12"
-            args "-v /tmp:/tmp -p 80:80"
+            args "-v /tmp:/tmp"
         }
     }
     stages {
diff --git a/pipeline-model-definition/src/test/resources/dirSepInDockerfileName.groovy b/pipeline-model-definition/src/test/resources/dirSepInDockerfileName.groovy
@@ -26,7 +26,7 @@ pipeline {
     agent {
         dockerfile {
             filename "subdir/Dockerfile"
-            args "-v /tmp:/tmp -p 8000:8000"
+            args "-v /tmp:/tmp"
         }
     }
     stages {
diff --git a/pipeline-model-definition/src/test/resources/dockerPullLocalImage.groovy b/pipeline-model-definition/src/test/resources/dockerPullLocalImage.groovy
@@ -34,7 +34,7 @@ pipeline {
             agent {
                 docker {
                     image "maven:3-alpine"
-                    args "-v /tmp:/tmp -p 8000:8000"
+                    args "-v /tmp:/tmp"
                     reuseNode true
                 }
             }
diff --git a/pipeline-model-definition/src/test/resources/failureBeforeStages.groovy b/pipeline-model-definition/src/test/resources/failureBeforeStages.groovy
@@ -25,7 +25,7 @@
 pipeline {
     agent {
         dockerfile {
-            args "-v /tmp:/tmp -p 8000:8000"
+            args "-v /tmp:/tmp"
         }
     }
     stages {
diff --git a/pipeline-model-definition/src/test/resources/fromAlternateDockerfile.groovy b/pipeline-model-definition/src/test/resources/fromAlternateDockerfile.groovy
@@ -26,7 +26,7 @@ pipeline {
     agent {
         dockerfile {
             filename "Dockerfile.alternate"
-            args "-v /tmp:/tmp -p 8000:8000"
+            args "-v /tmp:/tmp"
         }
     }
     stages {
diff --git a/pipeline-model-definition/src/test/resources/fromDockerfile.groovy b/pipeline-model-definition/src/test/resources/fromDockerfile.groovy
@@ -25,7 +25,7 @@
 pipeline {
     agent {
         dockerfile {
-            args "-v /tmp:/tmp -p 8000:8000"
+            args "-v /tmp:/tmp"
         }
     }
     stages {
diff --git a/pipeline-model-definition/src/test/resources/fromDockerfileInOtherDir.groovy b/pipeline-model-definition/src/test/resources/fromDockerfileInOtherDir.groovy
@@ -25,7 +25,7 @@
 pipeline {
     agent {
         dockerfile {
-            args "-v /tmp:/tmp -p 8000:8000"
+            args "-v /tmp:/tmp"
             dir "subdir"
         }
     }
diff --git a/pipeline-model-definition/src/test/resources/json/agentDocker.json b/pipeline-model-definition/src/test/resources/json/agentDocker.json
@@ -41,7 +41,7 @@
         "key": "args",
         "value":         {
           "isLiteral": true,
-          "value": "-v /tmp:/tmp -p 80:80"
+          "value": "-v /tmp:/tmp"
         }
       }
     ]
diff --git a/pipeline-model-definition/src/test/resources/nonExistentDockerImage.groovy b/pipeline-model-definition/src/test/resources/nonExistentDockerImage.groovy
@@ -26,7 +26,7 @@ pipeline {
     agent {
         docker {
             image "httpdIDontExist:2.4.12"
-            args "-v /tmp:/tmp -p 80:80"
+            args "-v /tmp:/tmp"
         }
     }
     stages {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`pipeline {`
`26`	`26`	`agent {`
`27`	`27`	`dockerfile {`
`28`		`- args "-v /tmp:/tmp -p 8000:8000"`
	`28`	`+ args "-v /tmp:/tmp"`
`29`	`29`	`additionalBuildArgs "--build-arg someArg=thisOtherArg"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ pipeline {`
`26`	`26`	`agent {`
`27`	`27`	`docker {`
`28`	`28`	`image "httpd:2.4.12"`
`29`		`- args "-v /tmp:/tmp -p 80:80"`
	`29`	`+ args "-v /tmp:/tmp"`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`stages {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ pipeline {`
`31`	`31`	`docker {`
`32`	`32`	`label "thisspec"`
`33`	`33`	`image "httpd:2.4.12"`
`34`		`- args "-v /tmp:/tmp -p 80:80"`
	`34`	`+ args "-v /tmp:/tmp"`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`stages {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ pipeline {`
`30`	`30`	`agent {`
`31`	`31`	`docker {`
`32`	`32`	`image "httpd:2.4.12"`
`33`		`- args "-v /tmp:/tmp -p 80:80"`
	`33`	`+ args "-v /tmp:/tmp"`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`stages {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ pipeline {`
`34`	`34`	`agent {`
`35`	`35`	`docker {`
`36`	`36`	`image "maven:3-alpine"`
`37`		`- args "-v /tmp:/tmp -p 8000:8000"`
	`37`	`+ args "-v /tmp:/tmp"`
`38`	`38`	`reuseNode true`
`39`	`39`	`}`
`40`	`40`	`}`