Bump remoting to 3071.v7e9b 0dc08466 (both parent image tag and inc…

…oming release to `3071.v7e9b 0dc08466-1`) (#293)
jenkinsci · Oct 31, 2022 · b07329f · b07329f
1 parent 62ee569
commit b07329f
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 27 deletions.
diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
@@ -21,7 +21,7 @@
 #  THE SOFTWARE.
 
 #TODO(oleg_nenashev): Does it also need an update?
-ARG version=3063.v26e24490f041-1
+ARG version=3071.v7e9b_0dc08466-1
 FROM jenkins/agent:${version}-alpine-jdk11
 
 ARG version

diff --git a/11/debian/Dockerfile b/11/debian/Dockerfile
@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3063.v26e24490f041-1
+ARG version=3071.v7e9b_0dc08466-1
 FROM jenkins/agent:${version}-jdk11
 
 ARG version

diff --git a/11/windows/nanoserver-1809/Dockerfile b/11/windows/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=3063.v26e24490f041-1
+ARG version=3071.v7e9b_0dc08466-1
 FROM jenkins/agent:${version}-jdk11-nanoserver-1809
 
 ARG version

diff --git a/11/windows/windowsservercore-ltsc2019/Dockerfile b/11/windows/windowsservercore-ltsc2019/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3063.v26e24490f041-1
+ARG version=3071.v7e9b_0dc08466-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"

diff --git a/17/alpine/Dockerfile b/17/alpine/Dockerfile
@@ -21,7 +21,7 @@
 #  THE SOFTWARE.
 
 #TODO(oleg_nenashev): Does it also need an update?
-ARG version=3063.v26e24490f041-1
+ARG version=3071.v7e9b_0dc08466-1
 FROM jenkins/agent:${version}-alpine-jdk17
 
 ARG version

diff --git a/17/debian/Dockerfile b/17/debian/Dockerfile
@@ -1,4 +1,4 @@
-ARG version=3063.v26e24490f041-1
+ARG version=3071.v7e9b_0dc08466-1
 FROM jenkins/agent:${version}-jdk17
 
 ARG version

diff --git a/17/windows/nanoserver-1809/Dockerfile b/17/windows/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=3063.v26e24490f041-1
+ARG version=3071.v7e9b_0dc08466-1
 FROM jenkins/agent:${version}-jdk17-nanoserver-1809
 
 ARG version

diff --git a/17/windows/windowsservercore-ltsc2019/Dockerfile b/17/windows/windowsservercore-ltsc2019/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3063.v26e24490f041-1
+ARG version=3071.v7e9b_0dc08466-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"

diff --git a/Makefile b/Makefile
@@ -57,7 +57,7 @@ list: check-reqs
 bats:
 	git clone https://github.com/bats-core/bats-core bats ;\
 	cd bats ;\
-	git checkout v1.4.1
+	git checkout v1.8.2
 
 prepare-test: bats check-reqs
 	git submodule update --init --recursive

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -18,20 +18,14 @@ group "linux-s390x" {
   targets = []
 }
 
-#### This is the current (e.g. jenkins/inbound-agent) version (including build number suffix)
+#### This is the current (e.g. jenkins/inbound-agent) version (including build number suffix). Overridden by release builds from GIT_TAG.
 variable "IMAGE_TAG" {
-  default = "3063.v26e24490f041-1"
-}
-variable "REMOTING_VERSION" {
-  default = split("-", "${IMAGE_TAG}")[0]
-}
-variable "BUILD_NUMBER" {
-  default = split("-", "${IMAGE_TAG}")[1]
+  default = "3071.v7e9b_0dc08466-1"
 }
 
-#### This is for the "parent" image to use: remoting version is interpolated from IMAGE_TAG) but parent image also have a build number suffix
+#### This is for the "parent" image version to use (jenkins/agent:<PARENT_IMAGE_AGENT_VERSION>-<base-os>)
 variable "PARENT_IMAGE_VERSION" {
-  default = "${REMOTING_VERSION}-1"
+  default = "3071.v7e9b_0dc08466-1"
 }
 
 variable "REGISTRY" {
@@ -53,8 +47,8 @@ target "alpine_jdk11" {
     version = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-alpine": "",
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-alpine-jdk11": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk11": "",
     "${REGISTRY}/${JENKINS_REPO}:alpine",
     "${REGISTRY}/${JENKINS_REPO}:alpine-jdk11",
     "${REGISTRY}/${JENKINS_REPO}:latest-alpine",
@@ -70,7 +64,7 @@ target "alpine_jdk17" {
     version = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-alpine-jdk17": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk17": "",
     "${REGISTRY}/${JENKINS_REPO}:alpine-jdk17",
     "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk17",
   ]
@@ -84,8 +78,8 @@ target "debian_jdk11" {
     version = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}": "",
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk11": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk11": "",
     "${REGISTRY}/${JENKINS_REPO}:jdk11",
     "${REGISTRY}/${JENKINS_REPO}:latest",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk11",
@@ -100,7 +94,7 @@ target "debian_jdk17" {
     version = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk17": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk17": "",
     "${REGISTRY}/${JENKINS_REPO}:jdk17",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk17",
   ]

diff --git a/make.ps1 b/make.ps1
@@ -4,8 +4,8 @@ Param(
     [String] $Target = "build",
     [String] $AdditionalArgs = '',
     [String] $Build = '',
-    [String] $VersionTag = '3063.v26e24490f041-1',
-    [String] $DockerAgentVersion = '3063.v26e24490f041-1',
+    [String] $VersionTag = '3071.v7e9b_0dc08466-1',
+    [String] $DockerAgentVersion = '3071.v7e9b_0dc08466-1',
     [switch] $PushVersions = $false
 )