Skip to content
Snippets Groups Projects
Commit d3fa7213 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

jenkinsfile: remove stages inside docker

Change-Id: Ic761466ece67e5e52d0b7e263ded0fa046308f7a
parent 5c258241
Branches
Tags
No related merge requests found
...@@ -85,7 +85,7 @@ pipeline { ...@@ -85,7 +85,7 @@ pipeline {
} }
} }
stage('Build project') { stage('Build Client') {
steps { steps {
script { script {
def jenkinsUID = sh(returnStdout: true, script: 'id -u jenkins').replaceAll("\n", '').trim() def jenkinsUID = sh(returnStdout: true, script: 'id -u jenkins').replaceAll("\n", '').trim()
...@@ -95,9 +95,6 @@ pipeline { ...@@ -95,9 +95,6 @@ pipeline {
docker.image('client-validation').withRun('-t -u '+jenkinsUser+' -v '+pwd()+':/foo:rw -w /foo -e BATCH_MODE=1', '/bin/bash') { docker.image('client-validation').withRun('-t -u '+jenkinsUser+' -v '+pwd()+':/foo:rw -w /foo -e BATCH_MODE=1', '/bin/bash') {
container -> code:{ container -> code:{
stage('Build Client') {
steps {
script {
def base_cmd = 'docker exec -t '+container.id+" sh -c '" def base_cmd = 'docker exec -t '+container.id+" sh -c '"
def exec_cmd = { cmd -> sh base_cmd+cmd+"'" } def exec_cmd = { cmd -> sh base_cmd+cmd+"'" }
...@@ -118,20 +115,6 @@ pipeline { ...@@ -118,20 +115,6 @@ pipeline {
make -j${cpuCount} make -j${cpuCount}
make install make install
""") """)
}
}
}
}
stage('Run Tests') {
steps {
script {
def base_cmd = 'docker exec -t '+container.id+" sh -c '"
def exec_cmd = { cmd -> sh base_cmd+cmd+"'" }
def dockerTopDir = '/foo'
def clientDir = dockerTopDir + '/client-qt'
ansiColor('css') {
exec_cmd(""" exec_cmd("""
cd ${clientDir} cd ${clientDir}
cd tests/qml cd tests/qml
...@@ -145,6 +128,3 @@ pipeline { ...@@ -145,6 +128,3 @@ pipeline {
} }
} }
} }
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment