Merge pull request #159 from oleg-nenashev/agent/4.3-2

[INFRA-1105] - Update the base image to jenkins/agent:4.3-4, cleanup old metadata
jenkinsci · Apr 13, 2020 · efc5710 · efc5710
2 parents f4cafb2 + b0be427
commit efc5710
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 23 deletions.
diff --git a/11/debian/Dockerfile b/11/debian/Dockerfile
@@ -20,11 +20,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.3-1-jdk11
-FROM jenkins/slave:$version
+ARG version=4.3-4-jdk11
+FROM jenkins/agent:$version
 
 ARG version
-MAINTAINER Oleg Nenashev <[email protected]>
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins

diff --git a/11/nanoserver-1809/Dockerfile b/11/nanoserver-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.3-1
+ARG VERSION=4.3-4
 FROM jenkins/agent:${VERSION}-nanoserver-1809-jdk11
 
 ARG VERSION

diff --git a/11/windowsservercore-1809/Dockerfile b/11/windowsservercore-1809/Dockerfile
@@ -21,10 +21,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.3-1
+ARG VERSION=4.3-4
 FROM jenkins/agent:${VERSION}-windowsservercore-1809-jdk11
 
-ARG VERSION
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"
 
 ARG user=jenkins

diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile
@@ -20,11 +20,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.3-1-alpine
-FROM jenkins/slave:$version
+ARG version=4.3-4-alpine
+FROM jenkins/agent:$version
 
 ARG version
-MAINTAINER Oleg Nenashev <[email protected]>
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins

diff --git a/8/debian/Dockerfile b/8/debian/Dockerfile
@@ -20,11 +20,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.3-1
-FROM jenkins/slave:$version
+ARG version=4.3-4
+FROM jenkins/agent:$version
 
 ARG version
-MAINTAINER Oleg Nenashev <[email protected]>
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins

diff --git a/8/nanoserver-1809/Dockerfile b/8/nanoserver-1809/Dockerfile
@@ -21,10 +21,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.3-1
+ARG VERSION=4.3-4
 FROM jenkins/agent:${VERSION}-nanoserver-1809
 
-ARG VERSION
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"
 
 ARG user=jenkins

diff --git a/8/windowsservercore-1809/Dockerfile b/8/windowsservercore-1809/Dockerfile
@@ -21,8 +21,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.3-1
+ARG VERSION=4.3-4
 FROM jenkins/agent:${VERSION}-windowsservercore-1809
+
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"
 
 ARG user=jenkins

diff --git a/tests/jnlpAgent.Tests.ps1 b/tests/jnlpAgent.Tests.ps1
@@ -1,11 +1,11 @@
 Import-Module -DisableNameChecking -Force $PSScriptRoot/test_helpers.psm1
 
-$AGENT_IMAGE='jenkins-jnlp-agent'
-$AGENT_CONTAINER='pester-jenkins-jnlp-agent'
+$AGENT_IMAGE='jenkins-inbound-agent'
+$AGENT_CONTAINER='pester-jenkins-inbound-agent'
 $SHELL="powershell.exe"
 
 $FOLDER = Get-EnvOrDefault 'FOLDER' ''
-$VERSION = Get-EnvOrDefault 'VERSION' '4.0.1-1'
+$VERSION = Get-EnvOrDefault 'VERSION' '4.3-4'
 
 $REAL_FOLDER=Resolve-Path -Path "$PSScriptRoot/../${FOLDER}"
 
@@ -106,7 +106,6 @@ Describe "[$JDK $FLAVOR] build args" {
     }
 
     It 'uses build args correctly' {
-        #$TEST_VERSION="3.36"
         $TEST_VERSION="4.3"
         $TEST_USER="foo"
 

diff --git a/tests/tests.bats b/tests/tests.bats
@@ -78,17 +78,18 @@ function teardown () {
   cd "${BATS_TEST_DIRNAME}"/.. || false
 
   local ARG_TEST_VERSION
-  local TEST_VERSION="3.36"
+  local TEST_VERSION="4.3"
+  local DOCKER_AGENT_VERSION_SUFFIX="4"
   local TEST_USER="root"
 
 	if [[ "${FLAVOR}" = "debian" ]]
   then
-    ARG_TEST_VERSION="${TEST_VERSION}-1"
+    ARG_TEST_VERSION="${TEST_VERSION}-${DOCKER_AGENT_VERSION_SUFFIX}"
   elif [[ "${FLAVOR}" = "jdk11" ]]
   then
-    ARG_TEST_VERSION="${TEST_VERSION}-1-jdk11"
+    ARG_TEST_VERSION="${TEST_VERSION}-${DOCKER_AGENT_VERSION_SUFFIX}-jdk11"
   else
-    ARG_TEST_VERSION="${TEST_VERSION}-1-alpine"
+    ARG_TEST_VERSION="${TEST_VERSION}-${DOCKER_AGENT_VERSION_SUFFIX}-alpine"
   fi
 
   docker build \