[DO-1054] Support qt 5.15 (#31)
[DO-1054] Co-authored-by: Denis Patrakeev <denis.patrakeev@avroid.tech> Reviewed-on: https://git.avroid.tech/DevOps/jenkins-shared-lib/pulls/31
This commit is contained in:
@@ -3,7 +3,7 @@ def call(String podTemplateName) {
|
|||||||
Object alpineTemplate = """
|
Object alpineTemplate = """
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: linux
|
- name: linux
|
||||||
image: ${env.JENKINS_DOCKER_REGISTRY}/docker-hub-proxy/library/alpine:3.18.5
|
image: ${env.JENKINS_DOCKER_REGISTRY}/docker-hub-proxy/library/alpine:3.18.5
|
||||||
@@ -26,7 +26,7 @@ Object tavroAuroraV4Template = """
|
|||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
container.apparmor.security.beta.kubernetes.io/aurora: unconfined
|
container.apparmor.security.beta.kubernetes.io/aurora: unconfined
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: aurora
|
- name: aurora
|
||||||
image: ${env.JENKINS_DOCKER_REGISTRY}/tavro/tavro-build-aurora:4.0.2.249-1
|
image: ${env.JENKINS_DOCKER_REGISTRY}/tavro/tavro-build-aurora:4.0.2.249-1
|
||||||
@@ -90,7 +90,7 @@ Object containerAuroraTemplate = """
|
|||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
container.apparmor.security.beta.kubernetes.io/aurora: unconfined
|
container.apparmor.security.beta.kubernetes.io/aurora: unconfined
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: aurora
|
- name: aurora
|
||||||
image: ${env.JENKINS_DOCKER_REGISTRY}/container/container-build-aurora:5.1.0.100-1
|
image: ${env.JENKINS_DOCKER_REGISTRY}/container/container-build-aurora:5.1.0.100-1
|
||||||
@@ -183,7 +183,7 @@ Object containerLinuxTemplate = """
|
|||||||
Object sonarCubeScannerTemplate = """
|
Object sonarCubeScannerTemplate = """
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: sonar-scanner
|
- name: sonar-scanner
|
||||||
image: ${env.JENKINS_DOCKER_REGISTRY}/docker-hub-proxy/sonarsource/sonar-scanner-cli:5.0.1
|
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}
|
- 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) {
|
switch (podTemplateName) {
|
||||||
case 'alpine':
|
case 'alpine':
|
||||||
return alpineTemplate
|
return alpineTemplate
|
||||||
@@ -247,5 +272,7 @@ Object tavroLinuxTemplate = """
|
|||||||
return sonarCubeScannerTemplate
|
return sonarCubeScannerTemplate
|
||||||
case 'tavroLinux':
|
case 'tavroLinux':
|
||||||
return tavroLinuxTemplate
|
return tavroLinuxTemplate
|
||||||
|
case 'tavroLinux_qt_5_15':
|
||||||
|
return tavroLinuxTemplateQT_5_15
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user