From e073c45e3a3166ae3650853fb6041f6e72e5a987 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 15 Dec 2022 10:55:45 +0100 Subject: [PATCH 01/15] CI/CD pipeline extended with custom docker image Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 236 ++++++++++++++++++++++++++++++- 1 file changed, 232 insertions(+), 4 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 3a0298b14a..1323e41816 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -10,7 +10,83 @@ pipeline { parallel { stage('JDK 8 ') { agent { - label 'centos-7' + kubernetes { + label 'jdk8-agent-pod' + yaml """ +apiVersion: v1 +kind: Pod +spec: + volumes: + - name: tools + persistentVolumeClaim: + claimName: tools-claim-jiro-eclipselink + - name: volume-known-hosts + configMap: + name: known-hosts + - name: settings-xml + secret: + secretName: m2-secret-dir + items: + - key: settings.xml + path: settings.xml + - name: toolchains-xml + configMap: + name: m2-dir + items: + - key: toolchains.xml + path: toolchains.xml + - name: settings-security-xml + secret: + secretName: m2-secret-dir + items: + - key: settings-security.xml + path: settings-security.xml + - name: m2-repo + emptyDir: {} + + containers: + - name: jnlp + resources: + limits: + memory: "4Gi" + cpu: "2" + requests: + memory: "4Gi" + cpu: "1" + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: el-build + resources: + limits: + memory: "12Gi" + cpu: "6" + requests: + memory: "12Gi" + cpu: "5.5" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: + - cat +""" + } } tools { jdk 'oracle-jdk8-latest' @@ -24,7 +100,83 @@ pipeline { } stage('JDK 11 ') { agent { - label 'centos-7' + kubernetes { + label 'jdk11-agent-pod' + yaml """ +apiVersion: v1 +kind: Pod +spec: + volumes: + - name: tools + persistentVolumeClaim: + claimName: tools-claim-jiro-eclipselink + - name: volume-known-hosts + configMap: + name: known-hosts + - name: settings-xml + secret: + secretName: m2-secret-dir + items: + - key: settings.xml + path: settings.xml + - name: toolchains-xml + configMap: + name: m2-dir + items: + - key: toolchains.xml + path: toolchains.xml + - name: settings-security-xml + secret: + secretName: m2-secret-dir + items: + - key: settings-security.xml + path: settings-security.xml + - name: m2-repo + emptyDir: {} + + containers: + - name: jnlp + resources: + limits: + memory: "4Gi" + cpu: "2" + requests: + memory: "4Gi" + cpu: "1" + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: el-build + resources: + limits: + memory: "12Gi" + cpu: "6" + requests: + memory: "12Gi" + cpu: "5.5" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: + - cat +""" + } } tools { jdk 'openjdk-jdk11-latest' @@ -38,7 +190,83 @@ pipeline { } stage('JDK 19 ') { agent { - label 'centos-7' + kubernetes { + label 'jdk19-agent-pod' + yaml """ +apiVersion: v1 +kind: Pod +spec: + volumes: + - name: tools + persistentVolumeClaim: + claimName: tools-claim-jiro-eclipselink + - name: volume-known-hosts + configMap: + name: known-hosts + - name: settings-xml + secret: + secretName: m2-secret-dir + items: + - key: settings.xml + path: settings.xml + - name: toolchains-xml + configMap: + name: m2-dir + items: + - key: toolchains.xml + path: toolchains.xml + - name: settings-security-xml + secret: + secretName: m2-secret-dir + items: + - key: settings-security.xml + path: settings-security.xml + - name: m2-repo + emptyDir: {} + + containers: + - name: jnlp + resources: + limits: + memory: "4Gi" + cpu: "2" + requests: + memory: "4Gi" + cpu: "1" + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: el-build + resources: + limits: + memory: "12Gi" + cpu: "6" + requests: + memory: "12Gi" + cpu: "5.5" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: + - cat +""" + } } tools { jdk 'openjdk-jdk19-latest' @@ -53,4 +281,4 @@ pipeline { } } } -} +} \ No newline at end of file From 64d9d8babc1e6344102eeaaed6be08f7a011ba1b Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 15 Dec 2022 11:01:31 +0100 Subject: [PATCH 02/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 1323e41816..39ee58fd6a 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -48,22 +48,22 @@ spec: - name: jnlp resources: limits: - memory: "4Gi" - cpu: "2" + memory: "1Gi" + cpu: "0.5" requests: - memory: "4Gi" - cpu: "1" + memory: "1Gi" + cpu: "0.5" volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh - name: el-build resources: limits: - memory: "12Gi" - cpu: "6" + memory: "8Gi" + cpu: "2" requests: - memory: "12Gi" - cpu: "5.5" + memory: "8Gi" + cpu: "2" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools @@ -138,22 +138,22 @@ spec: - name: jnlp resources: limits: - memory: "4Gi" - cpu: "2" + memory: "1Gi" + cpu: "0.5" requests: - memory: "4Gi" - cpu: "1" + memory: "1Gi" + cpu: "0.5" volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh - name: el-build resources: limits: - memory: "12Gi" - cpu: "6" + memory: "8Gi" + cpu: "2" requests: - memory: "12Gi" - cpu: "5.5" + memory: "8Gi" + cpu: "2" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools @@ -228,22 +228,22 @@ spec: - name: jnlp resources: limits: - memory: "4Gi" - cpu: "2" + memory: "1Gi" + cpu: "0.5" requests: - memory: "4Gi" - cpu: "1" + memory: "1Gi" + cpu: "0.5" volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh - name: el-build resources: limits: - memory: "12Gi" - cpu: "6" + memory: "8Gi" + cpu: "2" requests: - memory: "12Gi" - cpu: "5.5" + memory: "8Gi" + cpu: "2" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools From 6a422f3037f2546dd6897b0aa67b5d61c2fe3c89 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 15 Dec 2022 11:03:10 +0100 Subject: [PATCH 03/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 39ee58fd6a..a0d446aa65 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -59,10 +59,10 @@ spec: - name: el-build resources: limits: - memory: "8Gi" + memory: "7Gi" cpu: "2" requests: - memory: "8Gi" + memory: "7Gi" cpu: "2" image: tkraus/el-build:2.0.2 volumeMounts: @@ -149,10 +149,10 @@ spec: - name: el-build resources: limits: - memory: "8Gi" + memory: "7Gi" cpu: "2" requests: - memory: "8Gi" + memory: "7Gi" cpu: "2" image: tkraus/el-build:2.0.2 volumeMounts: @@ -239,10 +239,10 @@ spec: - name: el-build resources: limits: - memory: "8Gi" + memory: "7Gi" cpu: "2" requests: - memory: "8Gi" + memory: "7Gi" cpu: "2" image: tkraus/el-build:2.0.2 volumeMounts: From b3bf4412fd92cd895717a139f86957b57a867efc Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 15 Dec 2022 11:05:49 +0100 Subject: [PATCH 04/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index a0d446aa65..d822c55c5d 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -49,10 +49,10 @@ spec: resources: limits: memory: "1Gi" - cpu: "0.5" + cpu: "0.3" requests: memory: "1Gi" - cpu: "0.5" + cpu: "0.3" volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh @@ -60,10 +60,10 @@ spec: resources: limits: memory: "7Gi" - cpu: "2" + cpu: "1.8" requests: memory: "7Gi" - cpu: "2" + cpu: "1.8" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools @@ -139,10 +139,10 @@ spec: resources: limits: memory: "1Gi" - cpu: "0.5" + cpu: "0.3" requests: memory: "1Gi" - cpu: "0.5" + cpu: "0.3" volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh @@ -150,10 +150,10 @@ spec: resources: limits: memory: "7Gi" - cpu: "2" + cpu: "1.8" requests: memory: "7Gi" - cpu: "2" + cpu: "1.8" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools @@ -229,10 +229,10 @@ spec: resources: limits: memory: "1Gi" - cpu: "0.5" + cpu: "0.3" requests: memory: "1Gi" - cpu: "0.5" + cpu: "0.3" volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh @@ -240,10 +240,10 @@ spec: resources: limits: memory: "7Gi" - cpu: "2" + cpu: "1.8" requests: memory: "7Gi" - cpu: "2" + cpu: "1.8" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools From a78e2f8ff560970587bfe0861d4c7031884bb3d8 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 15 Dec 2022 11:19:47 +0100 Subject: [PATCH 05/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index d822c55c5d..cf239dfdce 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -48,8 +48,8 @@ spec: - name: jnlp resources: limits: - memory: "1Gi" - cpu: "0.3" + memory: "1.5Gi" + cpu: "0.5" requests: memory: "1Gi" cpu: "0.3" @@ -59,8 +59,8 @@ spec: - name: el-build resources: limits: - memory: "7Gi" - cpu: "1.8" + memory: "8Gi" + cpu: "2" requests: memory: "7Gi" cpu: "1.8" @@ -138,8 +138,8 @@ spec: - name: jnlp resources: limits: - memory: "1Gi" - cpu: "0.3" + memory: "1.5Gi" + cpu: "0.5" requests: memory: "1Gi" cpu: "0.3" @@ -149,8 +149,8 @@ spec: - name: el-build resources: limits: - memory: "7Gi" - cpu: "1.8" + memory: "8Gi" + cpu: "2" requests: memory: "7Gi" cpu: "1.8" @@ -228,8 +228,8 @@ spec: - name: jnlp resources: limits: - memory: "1Gi" - cpu: "0.3" + memory: "1.5Gi" + cpu: "0.5" requests: memory: "1Gi" cpu: "0.3" @@ -239,8 +239,8 @@ spec: - name: el-build resources: limits: - memory: "7Gi" - cpu: "1.8" + memory: "8Gi" + cpu: "2" requests: memory: "7Gi" cpu: "1.8" From 296443c53c65f15e377955df1ee13f33eb49cdaf Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 15 Dec 2022 11:21:54 +0100 Subject: [PATCH 06/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index cf239dfdce..73de7055fb 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -59,11 +59,11 @@ spec: - name: el-build resources: limits: - memory: "8Gi" - cpu: "2" - requests: memory: "7Gi" - cpu: "1.8" + cpu: "1.5" + requests: + memory: "6Gi" + cpu: "1" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools @@ -149,11 +149,11 @@ spec: - name: el-build resources: limits: - memory: "8Gi" - cpu: "2" - requests: memory: "7Gi" - cpu: "1.8" + cpu: "1.5" + requests: + memory: "6Gi" + cpu: "1" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools @@ -239,11 +239,11 @@ spec: - name: el-build resources: limits: - memory: "8Gi" - cpu: "2" - requests: memory: "7Gi" - cpu: "1.8" + cpu: "1.5" + requests: + memory: "6Gi" + cpu: "1" image: tkraus/el-build:2.0.2 volumeMounts: - name: tools From cb0b8ac60239225a8b8cd6bdd35eac3765717a1d Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 15 Dec 2022 11:24:35 +0100 Subject: [PATCH 07/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 73de7055fb..7ae6f5f6e5 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -48,10 +48,10 @@ spec: - name: jnlp resources: limits: - memory: "1.5Gi" + memory: "1Gi" cpu: "0.5" requests: - memory: "1Gi" + memory: "0.8Gi" cpu: "0.3" volumeMounts: - name: volume-known-hosts @@ -138,10 +138,10 @@ spec: - name: jnlp resources: limits: - memory: "1.5Gi" + memory: "1Gi" cpu: "0.5" requests: - memory: "1Gi" + memory: "0.8Gi" cpu: "0.3" volumeMounts: - name: volume-known-hosts @@ -228,10 +228,10 @@ spec: - name: jnlp resources: limits: - memory: "1.5Gi" + memory: "1Gi" cpu: "0.5" requests: - memory: "1Gi" + memory: "0.8Gi" cpu: "0.3" volumeMounts: - name: volume-known-hosts From 21491086f65d8c11e3096a17b57112fb595aad23 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Fri, 16 Dec 2022 07:32:38 +0100 Subject: [PATCH 08/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 40 +++++++++----------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 7ae6f5f6e5..83277001d9 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -48,24 +48,15 @@ spec: - name: jnlp resources: limits: - memory: "1Gi" - cpu: "0.5" + memory: "4096Mi" + cpu: "2000m" requests: - memory: "0.8Gi" - cpu: "0.3" + memory: "4096Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh - - name: el-build - resources: - limits: - memory: "7Gi" - cpu: "1.5" - requests: - memory: "6Gi" - cpu: "1" - image: tkraus/el-build:2.0.2 - volumeMounts: - name: tools mountPath: /opt/tools - name: settings-xml @@ -138,24 +129,15 @@ spec: - name: jnlp resources: limits: - memory: "1Gi" - cpu: "0.5" + memory: "4096Mi" + cpu: "2000m" requests: - memory: "0.8Gi" - cpu: "0.3" - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - - name: el-build - resources: - limits: - memory: "7Gi" - cpu: "1.5" - requests: - memory: "6Gi" - cpu: "1" + memory: "4096Mi" + cpu: "1000m" image: tkraus/el-build:2.0.2 volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh - name: tools mountPath: /opt/tools - name: settings-xml From 7a5bdb709c7ca983583f7f4618d01d7cd8518a0b Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Fri, 16 Dec 2022 07:38:33 +0100 Subject: [PATCH 09/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 83277001d9..9e52521db7 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -210,24 +210,15 @@ spec: - name: jnlp resources: limits: - memory: "1Gi" - cpu: "0.5" - requests: - memory: "0.8Gi" - cpu: "0.3" - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - - name: el-build - resources: - limits: - memory: "7Gi" - cpu: "1.5" + memory: "4096Mi" + cpu: "2000m" requests: - memory: "6Gi" - cpu: "1" + memory: "4096Mi" + cpu: "1000m" image: tkraus/el-build:2.0.2 volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh - name: tools mountPath: /opt/tools - name: settings-xml From 75ef5438120660dfe58f4e5b168aa59145cbcbc1 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Fri, 16 Dec 2022 10:31:08 +0100 Subject: [PATCH 10/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 207 +------------------------------ 1 file changed, 3 insertions(+), 204 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 9e52521db7..29c69d73c9 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -10,74 +10,7 @@ pipeline { parallel { stage('JDK 8 ') { agent { - kubernetes { - label 'jdk8-agent-pod' - yaml """ -apiVersion: v1 -kind: Pod -spec: - volumes: - - name: tools - persistentVolumeClaim: - claimName: tools-claim-jiro-eclipselink - - name: volume-known-hosts - configMap: - name: known-hosts - - name: settings-xml - secret: - secretName: m2-secret-dir - items: - - key: settings.xml - path: settings.xml - - name: toolchains-xml - configMap: - name: m2-dir - items: - - key: toolchains.xml - path: toolchains.xml - - name: settings-security-xml - secret: - secretName: m2-secret-dir - items: - - key: settings-security.xml - path: settings-security.xml - - name: m2-repo - emptyDir: {} - - containers: - - name: jnlp - resources: - limits: - memory: "4096Mi" - cpu: "2000m" - requests: - memory: "4096Mi" - cpu: "1000m" - image: tkraus/el-build:2.0.2 - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - - name: tools - mountPath: /opt/tools - - name: settings-xml - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: toolchains-xml - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: settings-security-xml - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-repo - mountPath: /home/jenkins/.m2/repository - tty: true - command: - - cat -""" - } + docker { image 'tkraus/el-build:2.0.2' } } tools { jdk 'oracle-jdk8-latest' @@ -91,74 +24,7 @@ spec: } stage('JDK 11 ') { agent { - kubernetes { - label 'jdk11-agent-pod' - yaml """ -apiVersion: v1 -kind: Pod -spec: - volumes: - - name: tools - persistentVolumeClaim: - claimName: tools-claim-jiro-eclipselink - - name: volume-known-hosts - configMap: - name: known-hosts - - name: settings-xml - secret: - secretName: m2-secret-dir - items: - - key: settings.xml - path: settings.xml - - name: toolchains-xml - configMap: - name: m2-dir - items: - - key: toolchains.xml - path: toolchains.xml - - name: settings-security-xml - secret: - secretName: m2-secret-dir - items: - - key: settings-security.xml - path: settings-security.xml - - name: m2-repo - emptyDir: {} - - containers: - - name: jnlp - resources: - limits: - memory: "4096Mi" - cpu: "2000m" - requests: - memory: "4096Mi" - cpu: "1000m" - image: tkraus/el-build:2.0.2 - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - - name: tools - mountPath: /opt/tools - - name: settings-xml - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: toolchains-xml - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: settings-security-xml - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-repo - mountPath: /home/jenkins/.m2/repository - tty: true - command: - - cat -""" - } + docker { image 'tkraus/el-build:2.0.2' } } tools { jdk 'openjdk-jdk11-latest' @@ -172,74 +38,7 @@ spec: } stage('JDK 19 ') { agent { - kubernetes { - label 'jdk19-agent-pod' - yaml """ -apiVersion: v1 -kind: Pod -spec: - volumes: - - name: tools - persistentVolumeClaim: - claimName: tools-claim-jiro-eclipselink - - name: volume-known-hosts - configMap: - name: known-hosts - - name: settings-xml - secret: - secretName: m2-secret-dir - items: - - key: settings.xml - path: settings.xml - - name: toolchains-xml - configMap: - name: m2-dir - items: - - key: toolchains.xml - path: toolchains.xml - - name: settings-security-xml - secret: - secretName: m2-secret-dir - items: - - key: settings-security.xml - path: settings-security.xml - - name: m2-repo - emptyDir: {} - - containers: - - name: jnlp - resources: - limits: - memory: "4096Mi" - cpu: "2000m" - requests: - memory: "4096Mi" - cpu: "1000m" - image: tkraus/el-build:2.0.2 - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - - name: tools - mountPath: /opt/tools - - name: settings-xml - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: toolchains-xml - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: settings-security-xml - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-repo - mountPath: /home/jenkins/.m2/repository - tty: true - command: - - cat -""" - } + docker { image 'tkraus/el-build:2.0.2' } } tools { jdk 'openjdk-jdk19-latest' From 96d633b02086a0ecbd9809aeabefab6b5e6a95bf Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Mon, 19 Dec 2022 14:32:01 +0100 Subject: [PATCH 11/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 149 ++++++++++++++++++++++++++++--- 1 file changed, 139 insertions(+), 10 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 29c69d73c9..42a0e4e7a3 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -1,5 +1,137 @@ pipeline { - agent none + agent { + kubernetes { + label 'ci-agent-pod' + defaultContainer 'jnlp' + yaml """ + apiVersion: v1 + kind: Pod + spec: + volumes: + - name: tools + persistentVolumeClaim: + claimName: tools-claim-jiro-jersey + - name: volume-known-hosts + configMap: + name: known-hosts + - name: settings-xml + secret: + secretName: m2-secret-dir + items: + - key: settings.xml + path: settings.xml + - name: toolchains-xml + configMap: + name: m2-dir + items: + - key: toolchains.xml + path: toolchains.xml + - name: settings-security-xml + secret: + secretName: m2-secret-dir + items: + - key: settings-security.xml + path: settings-security.xml + - name: m2-repo + emptyDir: {} + + containers: + - name: jdk8 + resources: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: + - cat + - name: jdk11 + resources: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: + - cat + - name: jdk19 + resources: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: + - cat + """ + } + } options { timeout(time: 30, activity: true, unit: 'HOURS') @@ -9,9 +141,7 @@ pipeline { stage('Jersey build') { parallel { stage('JDK 8 ') { - agent { - docker { image 'tkraus/el-build:2.0.2' } - } + container("jdk8") { tools { jdk 'oracle-jdk8-latest' maven 'apache-maven-latest' @@ -21,11 +151,10 @@ pipeline { bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh ''' } + } } stage('JDK 11 ') { - agent { - docker { image 'tkraus/el-build:2.0.2' } - } + container("jdk11") { tools { jdk 'openjdk-jdk11-latest' maven 'apache-maven-latest' @@ -35,11 +164,10 @@ pipeline { bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh ''' } + } } stage('JDK 19 ') { - agent { - docker { image 'tkraus/el-build:2.0.2' } - } + container("jdk19") { tools { jdk 'openjdk-jdk19-latest' maven 'apache-maven-latest' @@ -49,6 +177,7 @@ pipeline { bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh ''' } + } } } } From 37de7cd6025d4f4c1e8399ce8c6d2e075de2b35b Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Mon, 19 Dec 2022 14:34:33 +0100 Subject: [PATCH 12/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 42a0e4e7a3..3429a796ba 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -141,12 +141,12 @@ pipeline { stage('Jersey build') { parallel { stage('JDK 8 ') { - container("jdk8") { tools { jdk 'oracle-jdk8-latest' maven 'apache-maven-latest' } steps { + container("jdk8") { sh ''' bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh ''' @@ -154,12 +154,12 @@ pipeline { } } stage('JDK 11 ') { - container("jdk11") { tools { jdk 'openjdk-jdk11-latest' maven 'apache-maven-latest' } steps { + container("jdk11") { sh ''' bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh ''' @@ -167,12 +167,12 @@ pipeline { } } stage('JDK 19 ') { - container("jdk19") { tools { jdk 'openjdk-jdk19-latest' maven 'apache-maven-latest' } steps { + container("jdk19") { sh ''' bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh ''' From 3f354e6904e7a1cfc36caa1b59864cf377a219a8 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Mon, 19 Dec 2022 14:41:01 +0100 Subject: [PATCH 13/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 120 +++++++++++++++---------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 3429a796ba..65fc25fea9 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -68,67 +68,67 @@ pipeline { command: - cat - name: jdk11 - resources: - limits: - memory: "1024Mi" - cpu: "2000m" - requests: - memory: "512Mi" - cpu: "1000m" - image: tkraus/el-build:2.0.2 - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - - name: tools - mountPath: /opt/tools - - name: settings-xml - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: toolchains-xml - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: settings-security-xml - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-repo - mountPath: /home/jenkins/.m2/repository - tty: true - command: - - cat + resources: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: + - cat - name: jdk19 - resources: - limits: - memory: "1024Mi" - cpu: "2000m" - requests: - memory: "512Mi" - cpu: "1000m" - image: tkraus/el-build:2.0.2 - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - - name: tools - mountPath: /opt/tools - - name: settings-xml - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: toolchains-xml - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: settings-security-xml - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-repo - mountPath: /home/jenkins/.m2/repository - tty: true - command: - - cat + resources: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: + - cat """ } } From 94dfff96dd123c12b6f6e39597705e5b410fbcc3 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Mon, 19 Dec 2022 14:47:10 +0100 Subject: [PATCH 14/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 158 +++++++++++++++---------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 65fc25fea9..6715402078 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -4,48 +4,48 @@ pipeline { label 'ci-agent-pod' defaultContainer 'jnlp' yaml """ - apiVersion: v1 - kind: Pod - spec: - volumes: - - name: tools - persistentVolumeClaim: - claimName: tools-claim-jiro-jersey - - name: volume-known-hosts - configMap: - name: known-hosts - - name: settings-xml - secret: - secretName: m2-secret-dir - items: +apiVersion: v1 +kind: Pod +spec: + volumes: + - name: tools + persistentVolumeClaim: + claimName: tools-claim-jiro-jersey + - name: volume-known-hosts + configMap: + name: known-hosts + - name: settings-xml + secret: + secretName: m2-secret-dir + items: - key: settings.xml path: settings.xml - - name: toolchains-xml - configMap: - name: m2-dir - items: + - name: toolchains-xml + configMap: + name: m2-dir + items: - key: toolchains.xml path: toolchains.xml - - name: settings-security-xml - secret: - secretName: m2-secret-dir - items: + - name: settings-security-xml + secret: + secretName: m2-secret-dir + items: - key: settings-security.xml path: settings-security.xml - - name: m2-repo - emptyDir: {} + - name: m2-repo + emptyDir: {} - containers: - - name: jdk8 - resources: - limits: - memory: "1024Mi" - cpu: "2000m" - requests: - memory: "512Mi" - cpu: "1000m" - image: tkraus/el-build:2.0.2 - volumeMounts: + containers: + - name: jdk8 + resources: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 + volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh - name: tools @@ -64,50 +64,19 @@ pipeline { readOnly: true - name: m2-repo mountPath: /home/jenkins/.m2/repository - tty: true - command: + tty: true + command: - cat - - name: jdk11 - resources: - limits: - memory: "1024Mi" - cpu: "2000m" - requests: - memory: "512Mi" - cpu: "1000m" - image: tkraus/el-build:2.0.2 - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - - name: tools - mountPath: /opt/tools - - name: settings-xml - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: toolchains-xml - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: settings-security-xml - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-repo - mountPath: /home/jenkins/.m2/repository - tty: true - command: - - cat - - name: jdk19 - resources: - limits: - memory: "1024Mi" - cpu: "2000m" - requests: - memory: "512Mi" - cpu: "1000m" - image: tkraus/el-build:2.0.2 - volumeMounts: + - name: jdk11 + resources: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 + volumeMounts: - name: volume-known-hosts mountPath: /home/jenkins/.ssh - name: tools @@ -128,8 +97,39 @@ pipeline { mountPath: /home/jenkins/.m2/repository tty: true command: + - cat + - name: jdk19 + resources: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + image: tkraus/el-build:2.0.2 + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + - name: tools + mountPath: /opt/tools + - name: settings-xml + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: toolchains-xml + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: settings-security-xml + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-repo + mountPath: /home/jenkins/.m2/repository + tty: true + command: - cat - """ +""" } } From bcc89ade287aa1b4eeb3336e656489efb9b3c0c7 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Mon, 19 Dec 2022 15:06:17 +0100 Subject: [PATCH 15/15] resource config Signed-off-by: Maxim Nesen --- etc/jenkins/Jenkinsfile_ci_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 6715402078..18859893d5 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -182,4 +182,4 @@ spec: } } } -} \ No newline at end of file +}