Skip to content

Commit

Permalink
Update jenkins pipeline to remove jenkins-specific configs
Browse files Browse the repository at this point in the history
  • Loading branch information
wanglinsong committed Dec 10, 2024
1 parent b2184a8 commit 0fc0482
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 52 deletions.
47 changes: 44 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,50 @@
AGENT_MAVEN = '''
apiVersion: v1
kind: Pod
spec:
containers:
- name: maven
image: maven:3.8.6-openjdk-8-slim
env:
- name: MAVEN_OPTS
value: "-Xmx8000m -Xms8000m"
resources:
requests:
memory: "16Gi"
cpu: "4000m"
limits:
memory: "16Gi"
cpu: "4000m"
tty: true
command:
- cat
'''

AGENT_DIND = '''
apiVersion: v1
kind: Pod
spec:
containers:
- name: dind
image: docker:20.10.16-dind-alpine3.15
securityContext:
privileged: true
tty: true
resources:
requests:
memory: "29Gi"
cpu: "7500m"
limits:
memory: "29Gi"
cpu: "7500m"
'''

pipeline {

agent none

environment {
AWS_CREDENTIAL_ID = 'aws-jenkins'
AWS_CREDENTIAL_ID = 'oss-presto-aws'
AWS_DEFAULT_REGION = 'us-east-1'
AWS_ECR = 'public.ecr.aws/oss-presto'
AWS_S3_PREFIX = 's3://oss-prestodb/presto'
Expand Down Expand Up @@ -33,7 +74,7 @@ pipeline {
agent {
kubernetes {
defaultContainer 'maven'
yamlFile 'jenkins/agent-maven.yaml'
yaml AGENT_MAVEN
}
}

Expand Down Expand Up @@ -132,7 +173,7 @@ pipeline {
agent {
kubernetes {
defaultContainer 'dind'
yamlFile 'jenkins/agent-dind.yaml'
yaml AGENT_DIND
}
}

Expand Down
23 changes: 0 additions & 23 deletions jenkins/agent-dind.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions jenkins/agent-maven.yaml

This file was deleted.

0 comments on commit 0fc0482

Please sign in to comment.