Skip to content

Commit 3747c5b

Browse files
wanglinsongtdcmeehan
authored andcommitted
Update Jenkins pipeline to remove instance specific configs
1 parent 05150a8 commit 3747c5b

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

Jenkinsfile

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,28 @@
1+
AGENT_YAML = '''
2+
apiVersion: v1
3+
kind: Pod
4+
spec:
5+
containers:
6+
- name: maven
7+
image: maven:3.8.6-openjdk-8-slim
8+
tty: true
9+
resources:
10+
requests:
11+
memory: "1Gi"
12+
cpu: "500m"
13+
limits:
14+
memory: "1Gi"
15+
cpu: "500m"
16+
command:
17+
- cat
18+
'''
19+
120
pipeline {
221

322
agent {
423
kubernetes {
524
defaultContainer 'maven'
6-
yamlFile 'jenkins/agent.yaml'
25+
yaml AGENT_YAML
726
}
827
}
928

@@ -12,7 +31,7 @@ pipeline {
1231
GPG_TRUST = credentials("presto-release-gpg-trust")
1332
GPG_PASSPHRASE = credentials("presto-release-gpg-passphrase")
1433

15-
GITHUB_OSS_TOKEN_ID = 'github-personal-token-wanglinsong'
34+
GITHUB_OSS_TOKEN_ID = 'oss-presto-github-token'
1635

1736
SONATYPE_NEXUS_CREDS = credentials('presto-sonatype-nexus-creds')
1837
SONATYPE_NEXUS_PASSWORD = "$SONATYPE_NEXUS_CREDS_PSW"
@@ -107,6 +126,7 @@ pipeline {
107126
gpg --batch --import ${GPG_SECRET}
108127
echo ${GPG_TRUST} | gpg --import-ownertrust -
109128
gpg --list-secret-keys
129+
echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf
110130
printenv | sort
111131
112132
git checkout ${REPO_RELEASE_TAG}
@@ -115,7 +135,7 @@ pipeline {
115135
git log -8
116136
head -n 18 pom.xml
117137
118-
mvn -s ${WORKSPACE}/jenkins/settings.xml -V -B -U -e -T2C deploy \
138+
mvn -s settings.xml -V -B -U -e -T2C deploy \
119139
-DautoReleaseAfterClose=true \
120140
-Dgpg.passphrase=${GPG_PASSPHRASE} \
121141
-DkeepStagingRepositoryOnCloseRuleFailure=true \

jenkins/agent.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)