Skip to content

Commit 0fc0482

Browse files
committed
Update jenkins pipeline to remove jenkins-specific configs
1 parent b2184a8 commit 0fc0482

File tree

3 files changed

+44
-52
lines changed

3 files changed

+44
-52
lines changed

Jenkinsfile

+44-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,50 @@
1+
AGENT_MAVEN = '''
2+
apiVersion: v1
3+
kind: Pod
4+
spec:
5+
containers:
6+
- name: maven
7+
image: maven:3.8.6-openjdk-8-slim
8+
env:
9+
- name: MAVEN_OPTS
10+
value: "-Xmx8000m -Xms8000m"
11+
resources:
12+
requests:
13+
memory: "16Gi"
14+
cpu: "4000m"
15+
limits:
16+
memory: "16Gi"
17+
cpu: "4000m"
18+
tty: true
19+
command:
20+
- cat
21+
'''
22+
23+
AGENT_DIND = '''
24+
apiVersion: v1
25+
kind: Pod
26+
spec:
27+
containers:
28+
- name: dind
29+
image: docker:20.10.16-dind-alpine3.15
30+
securityContext:
31+
privileged: true
32+
tty: true
33+
resources:
34+
requests:
35+
memory: "29Gi"
36+
cpu: "7500m"
37+
limits:
38+
memory: "29Gi"
39+
cpu: "7500m"
40+
'''
41+
142
pipeline {
243

344
agent none
445

546
environment {
6-
AWS_CREDENTIAL_ID = 'aws-jenkins'
47+
AWS_CREDENTIAL_ID = 'oss-presto-aws'
748
AWS_DEFAULT_REGION = 'us-east-1'
849
AWS_ECR = 'public.ecr.aws/oss-presto'
950
AWS_S3_PREFIX = 's3://oss-prestodb/presto'
@@ -33,7 +74,7 @@ pipeline {
3374
agent {
3475
kubernetes {
3576
defaultContainer 'maven'
36-
yamlFile 'jenkins/agent-maven.yaml'
77+
yaml AGENT_MAVEN
3778
}
3879
}
3980

@@ -132,7 +173,7 @@ pipeline {
132173
agent {
133174
kubernetes {
134175
defaultContainer 'dind'
135-
yamlFile 'jenkins/agent-dind.yaml'
176+
yaml AGENT_DIND
136177
}
137178
}
138179

jenkins/agent-dind.yaml

-23
This file was deleted.

jenkins/agent-maven.yaml

-26
This file was deleted.

0 commit comments

Comments
 (0)