From 2bfb7ab6c62b24a215b0d196fae35c50d2e2a7d8 Mon Sep 17 00:00:00 2001 From: Aleksandr Vodyanov Date: Fri, 28 Feb 2025 18:01:43 +0300 Subject: [PATCH] [DO-1651] update aosp container (!70) Co-authored-by: aleksandr.vodyanov Reviewed-on: https://git.avroid.tech/DevOps/jenkins-shared-lib/pulls/70 --- vars/getPodTemplate.groovy | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/vars/getPodTemplate.groovy b/vars/getPodTemplate.groovy index a58163c..15de630 100644 --- a/vars/getPodTemplate.groovy +++ b/vars/getPodTemplate.groovy @@ -84,38 +84,6 @@ Object tavroAuroraV5Template = """ - name: ${env.JENKINS_K8S_HARBOR_SECRET} """ -Object containerAuroraTemplate = """ - apiVersion: v1 - kind: Pod - metadata: - annotations: - container.apparmor.security.beta.kubernetes.io/aurora: unconfined - spec: - containers: - - name: aurora - image: ${env.JENKINS_DOCKER_REGISTRY}/container/container-build-aurora:5.1.3.85-2 - securityContext: - runAsUser: 1000 - runAsGroup: 1000 - capabilities: - add: - - SYS_ADMIN - tty: true - resources: - limits: - cpu: 15 - memory: 128Gi - requests: - cpu: 15 - memory: 32Gi - volumeMounts: - - mountPath: ${global.AURORA_CUSTOM_WORKSPACE} # Because home path removed within chroot - name: "workspace-volume" - ttyEnabled: true - imagePullSecrets: - - name: ${env.JENKINS_K8S_HARBOR_SECRET} -""" - Object containerLinuxTemplate = """ apiVersion: v1 kind: Pod @@ -132,7 +100,7 @@ Object containerLinuxTemplate = """ capabilities: add: - SYS_ADMIN - image: ${env.JENKINS_DOCKER_REGISTRY}/container/container-build-linux:1.2 + image: ${env.JENKINS_DOCKER_REGISTRY}/container/container-build-linux:1.3 command: - sleep args: