From 2456573e3710928848ade701d40a274395fee504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Wed, 28 Jun 2023 18:29:38 +0200 Subject: [PATCH 1/3] cleanup updatecli manifests --- updatecli/updatecli.d/git-windows.yml | 72 ++++----------------------- updatecli/updatecli.d/remoting.yaml | 32 +++--------- 2 files changed, 16 insertions(+), 88 deletions(-) diff --git a/updatecli/updatecli.d/git-windows.yml b/updatecli/updatecli.d/git-windows.yml index b8da6e72d..c5a29c08a 100644 --- a/updatecli/updatecli.d/git-windows.yml +++ b/updatecli/updatecli.d/git-windows.yml @@ -30,9 +30,9 @@ sources: - trimprefix: "v" targets: - ############# JDK11 Nanoserver 18.09 - setGitVersionJDK11WindowsNanoserver1809: - name: Update the Git Windows version for JDK11 Windows Nanoserver 1809 + ############# Nanoserver 18.09 + setGitVersionWindowsNanoserver1809: + name: Update the Git Windows version for Windows Nanoserver 1809 transformers: - findsubmatch: pattern: '(.*).windows\.(\d*)$' @@ -44,8 +44,8 @@ targets: keyword: ARG matcher: GIT_VERSION scmid: default - setGitPackagePatchJDK11WindowsNanoserver1809: - name: Update the Git Package Windows patch for JDK11 Windows Nanoserver 1809 + setGitPackagePatchWindowsNanoserver1809: + name: Update the Git Package Windows patch for Windows Nanoserver 1809 transformers: - findsubmatch: pattern: '(.*).windows\.(\d*)$' @@ -57,9 +57,9 @@ targets: keyword: ARG matcher: GIT_PATCH_VERSION scmid: default - ############# JDK11 Windows Server Core LTSC2019 - setGitVersionJDK11WindowsServer2019: - name: Update the Git Windows version for JDK11 Windows Server Core LTSC2019 + ############# Windows Server Core LTSC2019 + setGitVersionWindowsServer2019: + name: Update the Git Windows version for Windows Server Core LTSC2019 transformers: - findsubmatch: pattern: '(.*).windows\.(\d*)$' @@ -71,7 +71,7 @@ targets: keyword: ARG matcher: GIT_VERSION scmid: default - setGitPackagePatchJDK11WindowsServer2019: + setGitPackagePatchWindowsServer2019: name: Update the Git Package Windows patch for Windows Server Core LTSC2019 transformers: - findsubmatch: @@ -84,60 +84,6 @@ targets: keyword: ARG matcher: GIT_PATCH_VERSION scmid: default - ############# JDK17 Nanoserver 18.09 - setGitVersionJDK17WindowsNanoserver1809: - name: Update the Git Windows version for JDK17 Windows Nanoserver 1809 - transformers: - - findsubmatch: - pattern: '(.*).windows\.(\d*)$' - captureindex: 1 - kind: dockerfile - spec: - file: windows/nanoserver-1809/Dockerfile - instruction: - keyword: ARG - matcher: GIT_VERSION - scmid: default - setGitPackagePatchJDK17WindowsNanoserver1809: - name: Update the Git Package Windows patch for JDK17 Windows Nanoserver 1809 - transformers: - - findsubmatch: - pattern: '(.*).windows\.(\d*)$' - captureindex: 2 - kind: dockerfile - spec: - file: windows/nanoserver-1809/Dockerfile - instruction: - keyword: ARG - matcher: GIT_PATCH_VERSION - scmid: default - ############# JDK17 Windows Server Core LTSC2019 - setGitVersionJDK17WindowsServer2019: - name: Update the Git Windows version for JDK17 Windows Server Core LTSC2019 - transformers: - - findsubmatch: - pattern: '(.*).windows\.(\d*)$' - captureindex: 1 - kind: dockerfile - spec: - file: windows/windowsservercore-ltsc2019/Dockerfile - instruction: - keyword: ARG - matcher: GIT_VERSION - scmid: default - setGitPackagePatchJDK17WindowsServer2019: - name: Update the Git Package Windows patch for JDK17 Windows Server Core LTSC2019 - transformers: - - findsubmatch: - pattern: '(.*).windows\.(\d*)$' - captureindex: 2 - kind: dockerfile - spec: - file: windows/windowsservercore-ltsc2019/Dockerfile - instruction: - keyword: ARG - matcher: GIT_PATCH_VERSION - scmid: default actions: default: diff --git a/updatecli/updatecli.d/remoting.yaml b/updatecli/updatecli.d/remoting.yaml index 59485a0c6..a20f72cf7 100644 --- a/updatecli/updatecli.d/remoting.yaml +++ b/updatecli/updatecli.d/remoting.yaml @@ -35,7 +35,7 @@ conditions: targets: setAlpineDockerImage: - name: Bump the Jenkins remoting version on JDK11 Alpine + name: Bump the Jenkins remoting version on Alpine kind: dockerfile spec: file: alpine/Dockerfile @@ -44,7 +44,7 @@ targets: matcher: VERSION scmid: default setArchlinuxDockerImage: - name: Bump the Jenkins remoting version on JDK11 Archlinux + name: Bump the Jenkins remoting version on Archlinux kind: dockerfile spec: file: archlinux/Dockerfile @@ -53,7 +53,7 @@ targets: matcher: VERSION scmid: default setDebianDockerImage: - name: Bump the Jenkins remoting version on JDK11 Debian Bullseye + name: Bump the Jenkins remoting version on Debian Bullseye kind: dockerfile spec: file: debian/Dockerfile @@ -61,8 +61,8 @@ targets: keyword: ARG matcher: VERSION scmid: default - setJdk11WindowsNanoserver1809DockerImage: - name: Bump the Jenkins remoting version on JDK11 Windows Nanoserver 1809 + setWindowsNanoserver1809DockerImage: + name: Bump the Jenkins remoting version on Windows Nanoserver 1809 kind: dockerfile spec: file: windows/nanoserver-1809/Dockerfile @@ -70,26 +70,8 @@ targets: keyword: ARG matcher: VERSION scmid: default - setJdk11WindowsServer2019DockerImage: - name: Bump the Jenkins remoting version on JDK11 Windows Server 2019 - kind: dockerfile - spec: - file: windows/windowsservercore-ltsc2019/Dockerfile - instruction: - keyword: ARG - matcher: VERSION - scmid: default - setJdk17WindowsNanoserver1809DockerImage: - name: Bump the Jenkins remoting version on JDK17 Windows Nanoserver 1809 - kind: dockerfile - spec: - file: windows/nanoserver-1809/Dockerfile - instruction: - keyword: ARG - matcher: VERSION - scmid: default - setJdk17WindowsServer2019DockerImage: - name: Bump the Jenkins remoting version on JDK17 Windows Server 2019 + set11WindowsServer2019DockerImage: + name: Bump the Jenkins remoting version on Windows Server Core 2019 kind: dockerfile spec: file: windows/windowsservercore-ltsc2019/Dockerfile From 612fcadbee20ea9cfc86c51926808a4592c86867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Wed, 28 Jun 2023 19:22:49 +0200 Subject: [PATCH 2/3] rename .yml to .yaml --- updatecli/updatecli.d/{git-windows.yml => git-windows.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename updatecli/updatecli.d/{git-windows.yml => git-windows.yaml} (100%) diff --git a/updatecli/updatecli.d/git-windows.yml b/updatecli/updatecli.d/git-windows.yaml similarity index 100% rename from updatecli/updatecli.d/git-windows.yml rename to updatecli/updatecli.d/git-windows.yaml From 6b89a1e82edf74b638671e36a3c0940e2fd2b585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Sat, 1 Jul 2023 17:33:43 +0200 Subject: [PATCH 3/3] Update updatecli/updatecli.d/remoting.yaml Co-authored-by: Damien Duportal --- updatecli/updatecli.d/remoting.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli/updatecli.d/remoting.yaml b/updatecli/updatecli.d/remoting.yaml index a20f72cf7..0f53eabac 100644 --- a/updatecli/updatecli.d/remoting.yaml +++ b/updatecli/updatecli.d/remoting.yaml @@ -70,7 +70,7 @@ targets: keyword: ARG matcher: VERSION scmid: default - set11WindowsServer2019DockerImage: + setWindowsServer2019DockerImage: name: Bump the Jenkins remoting version on Windows Server Core 2019 kind: dockerfile spec: