Merge pull request #285 from dduportal/feat/bump-remoting/3063.v26e24…

…490f041

Feat: prepare release 3063.v26e24490f041-1

11/alpine/Dockerfile

@@ -21,8 +21,8 @@
 #  THE SOFTWARE.
 
 #TODO(oleg_nenashev): Does it also need an update?
-ARG version=latest-alpine-jdk11
-FROM jenkins/agent:$version
+ARG version=3063.v26e24490f041-1
+FROM jenkins/agent:${version}-alpine-jdk11
 
 ARG version
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

11/debian/Dockerfile

@@ -20,8 +20,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.9-1-jdk11
-FROM jenkins/agent:$version
+ARG version=3063.v26e24490f041-1
+FROM jenkins/agent:${version}-jdk11
 
 ARG version
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

11/windows/nanoserver-1809/Dockerfile

@@ -21,11 +21,11 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.9-1
-FROM jenkins/agent:${VERSION}-jdk11-nanoserver-1809
+ARG version=3063.v26e24490f041-1
+FROM jenkins/agent:${version}-jdk11-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 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
 

11/windows/windowsservercore-ltsc2019/Dockerfile

@@ -21,10 +21,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.9-1
-FROM jenkins/agent:${VERSION}-jdk11-windowsservercore-ltsc2019
+ARG version=3063.v26e24490f041-1
+FROM jenkins/agent:${version}-jdk11-windowsservercore-ltsc2019
 
-LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$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
 

17/alpine/Dockerfile

@@ -21,8 +21,8 @@
 #  THE SOFTWARE.
 
 #TODO(oleg_nenashev): Does it also need an update?
-ARG version=latest-alpine-jdk17
-FROM jenkins/agent:$version
+ARG version=3063.v26e24490f041-1
+FROM jenkins/agent:${version}-alpine-jdk17
 
 ARG version
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

17/debian/Dockerfile

@@ -1,5 +1,5 @@
-ARG version=4.13.3-2-jdk17
-FROM jenkins/agent:$version
+ARG version=3063.v26e24490f041-1
+FROM jenkins/agent:${version}-jdk17
 
 ARG version
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

17/windows/nanoserver-1809/Dockerfile

@@ -21,11 +21,11 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.9-1
-FROM jenkins/agent:${VERSION}-jdk17-nanoserver-1809
+ARG version=3063.v26e24490f041-1
+FROM jenkins/agent:${version}-jdk17-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 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
 

17/windows/windowsservercore-ltsc2019/Dockerfile

@@ -21,10 +21,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.9-1
-FROM jenkins/agent:${VERSION}-jdk17-windowsservercore-ltsc2019
+ARG version=3063.v26e24490f041-1
+FROM jenkins/agent:${version}-jdk17-windowsservercore-ltsc2019
 
-LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$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
 

docker-bake.hcl

@@ -34,8 +34,8 @@ variable "BUILD_NUMBER" {
 }
 
 #### This is for the "parent" image to use: remoting version is interpolated from IMAGE_TAG) but parent image also have a build number suffix
-variable "AGENT_IMAGE_BUILD_NUMBER" {
-  default = "1"
+variable "PARENT_IMAGE_VERSION" {
+  default = "${REMOTING_VERSION}-1"
 }
 
 variable "REGISTRY" {
@@ -54,7 +54,7 @@ target "alpine_jdk11" {
   dockerfile = "11/alpine/Dockerfile"
   context = "."
   args = {
-    version = "${REMOTING_VERSION}-${AGENT_IMAGE_BUILD_NUMBER}-alpine-jdk11"
+    version = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-alpine": "",
@@ -71,7 +71,7 @@ target "alpine_jdk17" {
   dockerfile = "17/alpine/Dockerfile"
   context = "."
   args = {
-    version = "${REMOTING_VERSION}-${AGENT_IMAGE_BUILD_NUMBER}-alpine-jdk17"
+    version = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-alpine-jdk17": "",
@@ -85,7 +85,7 @@ target "debian_jdk11" {
   dockerfile = "11/debian/Dockerfile"
   context = "."
   args = {
-    version = "${REMOTING_VERSION}-${AGENT_IMAGE_BUILD_NUMBER}-jdk11"
+    version = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}": "",
@@ -101,7 +101,7 @@ target "debian_jdk17" {
   dockerfile = "17/debian/Dockerfile"
   context = "."
   args = {
-    version = "${REMOTING_VERSION}-${AGENT_IMAGE_BUILD_NUMBER}-jdk17"
+    version = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk17": "",

make.ps1

@@ -4,7 +4,7 @@ Param(
     [String] $Target = "build",
     [String] $AdditionalArgs = '',
     [String] $Build = '',
-    [String] $VersionTag = '4.11.2-1',
+    [String] $VersionTag = '3063.v26e24490f041-1',
     [String] $DockerAgentVersion = '3063.v26e24490f041-1',
     [switch] $PushVersions = $false
 )
@@ -48,7 +48,7 @@ if(![System.String]::IsNullOrWhiteSpace($Build) -and $builds.ContainsKey($Build)
     foreach($tag in $builds[$Build]['Tags']) {
         Copy-Item -Path 'jenkins-agent.ps1' -Destination (Join-Path $builds[$Build]['Folder'] 'jenkins-agent.ps1') -Force
         Write-Host "Building $Build => tag=$tag"
-        $cmd = "docker build --build-arg 'VERSION={0}' -t {1}/{2}:{3} {4} {5}" -f $DockerAgentVersion, $Organization, $Repository, $tag, $AdditionalArgs, $builds[$Build]['Folder']
+        $cmd = "docker build --build-arg 'version={0}' -t {1}/{2}:{3} {4} {5}" -f $DockerAgentVersion, $Organization, $Repository, $tag, $AdditionalArgs, $builds[$Build]['Folder']
         Invoke-Expression $cmd
         $exitCodes += $lastExitCode
 
@@ -58,7 +58,7 @@ if(![System.String]::IsNullOrWhiteSpace($Build) -and $builds.ContainsKey($Build)
                 $buildTag = "$VersionTag"
             }
             Write-Host "Building $Build => tag=$buildTag"
-            $cmd = "docker build --build-arg 'VERSION={0}' -t {1}/{2}:{3} {4} {5}" -f $DockerAgentVersion, $Organization, $Repository, $buildTag, $AdditionalArgs, $builds[$Build]['Folder']
+            $cmd = "docker build --build-arg 'version={0}' -t {1}/{2}:{3} {4} {5}" -f $DockerAgentVersion, $Organization, $Repository, $buildTag, $AdditionalArgs, $builds[$Build]['Folder']
             Invoke-Expression $cmd
             $exitCodes += $lastExitCode
         }
@@ -68,7 +68,7 @@ if(![System.String]::IsNullOrWhiteSpace($Build) -and $builds.ContainsKey($Build)
         Copy-Item -Path 'jenkins-agent.ps1' -Destination (Join-Path $builds[$b]['Folder'] 'jenkins-agent.ps1') -Force
         foreach($tag in $builds[$b]['Tags']) {
             Write-Host "Building $b => tag=$tag"
-            $cmd = "docker build --build-arg 'VERSION={0}' -t {1}/{2}:{3} {4} {5}" -f $DockerAgentVersion, $Organization, $Repository, $tag, $AdditionalArgs, $builds[$b]['Folder']
+            $cmd = "docker build --build-arg 'version={0}' -t {1}/{2}:{3} {4} {5}" -f $DockerAgentVersion, $Organization, $Repository, $tag, $AdditionalArgs, $builds[$b]['Folder']
             Invoke-Expression $cmd
             $exitCodes += $lastExitCode
 
@@ -78,7 +78,7 @@ if(![System.String]::IsNullOrWhiteSpace($Build) -and $builds.ContainsKey($Build)
                     $buildTag = "$VersionTag"
                 }
                 Write-Host "Building $Build => tag=$buildTag"
-                $cmd = "docker build --build-arg 'VERSION={0}' -t {1}/{2}:{3} {4} {5}" -f $DockerAgentVersion, $Organization, $Repository, $buildTag, $AdditionalArgs, $builds[$b]['Folder']
+                $cmd = "docker build --build-arg 'version={0}' -t {1}/{2}:{3} {4} {5}" -f $DockerAgentVersion, $Organization, $Repository, $buildTag, $AdditionalArgs, $builds[$b]['Folder']
                 Invoke-Expression $cmd
                 $exitCodes += $lastExitCode
             }

tests/inboundAgent.Tests.ps1

@@ -129,13 +129,8 @@ Describe "[$global:JDK $global:FLAVOR] build args" {
     BeforeAll {
         Push-Location -StackName 'agent' -Path "$PSScriptRoot/.."
         # an old jdk11 image version
-        $TEST_VERSION="4.7"
+        $TEST_VERSION="3063.v26e24490f041"
         $DOCKER_AGENT_VERSION_SUFFIX="1"
-        if($global:JDK -eq '17') {
-            # the first jdk17 images for Windows
-            $TEST_VERSION = "4.10"
-            $DOCKER_AGENT_VERSION_SUFFIX="7"
-        }
         $TEST_USER="foo"
         $ARG_TEST_VERSION="${TEST_VERSION}-${DOCKER_AGENT_VERSION_SUFFIX}"
     }

tests/tests.bats

@@ -46,8 +46,8 @@ SUT_IMAGE=$(get_sut_image)
   cd "${BATS_TEST_DIRNAME}"/.. || false
 
   local ARG_TEST_VERSION
-  local TEST_VERSION="4.3"
-  local DOCKER_AGENT_VERSION_SUFFIX="4"
+  local TEST_VERSION="3063.v26e24490f041"
+  local DOCKER_AGENT_VERSION_SUFFIX="1"
   local TEST_USER="root"
   local ARG_TEST_VERSION="${TEST_VERSION}-${DOCKER_AGENT_VERSION_SUFFIX}"