Skip to content

Commit b80f3c1

Browse files
committed
Ajuste script jenkins para a nova versão do cluster.
1 parent 421caef commit b80f3c1

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

jenkinsfile

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,32 @@ podTemplate(
22
name: 'build-services',
33
namespace: 'jenkins ',
44
label: 'build-services',
5-
containers:
6-
[containerTemplate(
7-
args: 'cat',
8-
command: '/bin/sh -c',
9-
image: 'baseerp/docker:1.4',
10-
livenessProbe: containerLivenessProbe(execArgs: '',
11-
failureThreshold: 0,
12-
initialDelaySeconds: 0,
13-
periodSeconds: 0,
14-
successThreshold: 0,
15-
timeoutSeconds: 0),
16-
name: 'docker-container',
17-
resourceLimitCpu: '',
18-
resourceLimitMemory: '',
19-
resourceRequestCpu: '',
20-
resourceRequestMemory: '',
21-
ttyEnabled: true,
22-
workingDir: '/home/jenkins/agent')
23-
],
24-
volumes: [hostPathVolume(hostPath: '/var/run/docker.sock', mountPath: '/var/run/docker.sock')],
255
nodeSelector: 'type=jenkins-worker',
26-
)
27-
{
28-
node('build-services') {
6+
yaml: '''
7+
apiVersion: v1
8+
kind: Pod
9+
spec:
10+
containers:
11+
- name: docker-container
12+
image: baseerp/docker:1.9
13+
securityContext:
14+
privileged: true
15+
tty: true
16+
resources:
17+
requests:
18+
cpu: 1000m
19+
memory: 4000Mi
20+
ephemeral-storage: "30Gi"
21+
limits:
22+
cpu: "2000m"
23+
memory: "8000Mi"
24+
tolerations:
25+
- key: jenkins-worker
26+
operator: Equal
27+
value: true
28+
effect: NoExecute
29+
''') {
30+
node('build-services') {
2931

3032
echo '*********************************************************Parametros************************************************************************'
3133
echo '*******************************************************************************************************************************************'
@@ -59,11 +61,10 @@ podTemplate(
5961
echo '*********************************************************Package************************************************************************'
6062
withCredentials([usernamePassword(credentialsId: 'dockerhub', passwordVariable: 'DOCKER_HUB_PASSWORD', usernameVariable: 'DOCKER_HUB_USER')]) {
6163
withCredentials([usernamePassword(credentialsId: 'nexus', passwordVariable: 'NEXUS_PASSWORD', usernameVariable: 'NEXUS_USER')]) {
62-
def mavenImage = "baseerp/maven-services"
63-
def mavenImageVersion = "1.3"
64-
sh label: '', script: "docker login -u ${DOCKER_HUB_USER} -p ${DOCKER_HUB_PASSWORD}"
65-
sh label: '', script: "docker build -f Dockerfile-build -t ${imagem_build}:${versao} . --build-arg mavenImage=${mavenImage} --build-arg mavenImageVersion=${mavenImageVersion} --build-arg nameSpace=${namespace} --build-arg DskipTests=${DskipTests} --build-arg nexusUser=${NEXUS_USER} --build-arg nexusPass=${NEXUS_PASSWORD} --network=host"
66-
sh label: '', script: "docker rmi ${imagem_build}:${versao} --force"
64+
def mavenImage = "docker.io/baseerp/maven-services"
65+
def mavenImageVersion = "1.9"
66+
sh label: '', script: "buildah login -u ${DOCKER_HUB_USER} -p ${DOCKER_HUB_PASSWORD} docker.io"
67+
sh label: '', script: "buildah build -f Dockerfile-build -t ${imagem_build}:${versao} . --build-arg mavenImage=${mavenImage} --build-arg mavenImageVersion=${mavenImageVersion} --build-arg nameSpace=${namespace} --build-arg DskipTests=${DskipTests} --build-arg nexusUser=${NEXUS_USER} --build-arg nexusPass=${NEXUS_PASSWORD}"
6768
}
6869
}
6970
}

0 commit comments

Comments
 (0)