From 3dd65f165159e64c663a7d26d004be15cd2855c5 Mon Sep 17 00:00:00 2001 From: Boris Shestov Date: Wed, 11 Sep 2024 15:05:17 +0300 Subject: [PATCH] [DO-1054] Support qt 5.15 (#31) [DO-1054] Co-authored-by: Denis Patrakeev Reviewed-on: https://git.avroid.tech/DevOps/jenkins-shared-lib/pulls/31 --- vars/getPodTemplate.groovy | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/vars/getPodTemplate.groovy b/vars/getPodTemplate.groovy index aad86e5..979b61e 100644 --- a/vars/getPodTemplate.groovy +++ b/vars/getPodTemplate.groovy @@ -3,7 +3,7 @@ def call(String podTemplateName) { Object alpineTemplate = """ apiVersion: v1 kind: Pod - spec: + spec: containers: - name: linux image: ${env.JENKINS_DOCKER_REGISTRY}/docker-hub-proxy/library/alpine:3.18.5 @@ -26,7 +26,7 @@ Object tavroAuroraV4Template = """ metadata: annotations: container.apparmor.security.beta.kubernetes.io/aurora: unconfined - spec: + spec: containers: - name: aurora image: ${env.JENKINS_DOCKER_REGISTRY}/tavro/tavro-build-aurora:4.0.2.249-1 @@ -90,7 +90,7 @@ Object containerAuroraTemplate = """ metadata: annotations: container.apparmor.security.beta.kubernetes.io/aurora: unconfined - spec: + spec: containers: - name: aurora image: ${env.JENKINS_DOCKER_REGISTRY}/container/container-build-aurora:5.1.0.100-1 @@ -183,7 +183,7 @@ Object containerLinuxTemplate = """ Object sonarCubeScannerTemplate = """ apiVersion: v1 kind: Pod - spec: + spec: containers: - name: sonar-scanner image: ${env.JENKINS_DOCKER_REGISTRY}/docker-hub-proxy/sonarsource/sonar-scanner-cli:5.0.1 @@ -230,6 +230,31 @@ Object tavroLinuxTemplate = """ - name: ${env.JENKINS_K8S_HARBOR_SECRET} """ +Object tavroLinuxTemplateQT_5_15 = """ + apiVersion: v1 + kind: Pod + spec: + containers: + - name: linux + image: ${env.JENKINS_DOCKER_REGISTRY}/tavro/tavro-build-linux:1.2 + securityContext: + runAsUser: 1000 + runAsGroup: 1000 + command: + - sleep + args: + - 99d + resources: + limits: + cpu: 15 + memory: 32Gi + requests: + cpu: 15 + memory: 32Gi + imagePullSecrets: + - name: ${env.JENKINS_K8S_HARBOR_SECRET} +""" + switch (podTemplateName) { case 'alpine': return alpineTemplate @@ -247,5 +272,7 @@ Object tavroLinuxTemplate = """ return sonarCubeScannerTemplate case 'tavroLinux': return tavroLinuxTemplate + case 'tavroLinux_qt_5_15': + return tavroLinuxTemplateQT_5_15 } }