tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use gotemplate formater to extract specific data 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2019-12-04 10:10:37 +01:00 committed by Nicolas De loof
parent 9478725a70
commit 8859ab0d66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -90,7 +90,7 @@ def runTests(dockerVersion, pythonVersion, baseImage) {
stage("test python=${pythonVersion} / docker=${dockerVersion} / baseImage=${baseImage}") { stage("test python=${pythonVersion} / docker=${dockerVersion} / baseImage=${baseImage}") {
def scmvar = checkout(scm) def scmvar = checkout(scm)
def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}" def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}"
def storageDriver = sh(script: 'docker info | awk -F \': \' \'$1 == "Storage Driver" { print $2; exit }\'', returnStdout: true).trim() def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()
echo "Using local system's storage driver: ${storageDriver}" echo "Using local system's storage driver: ${storageDriver}"
sh """docker run \\ sh """docker run \\
-t \\ -t \\
@ -101,7 +101,7 @@ def runTests(dockerVersion, pythonVersion, baseImage) {
-e "TAG=${imageName}" \\ -e "TAG=${imageName}" \\
-e "STORAGE_DRIVER=${storageDriver}" \\ -e "STORAGE_DRIVER=${storageDriver}" \\
-e "DOCKER_VERSIONS=${dockerVersion}" \\ -e "DOCKER_VERSIONS=${dockerVersion}" \\
-e "BUILD_NUMBER=\$BUILD_TAG" \\ -e "BUILD_NUMBER=${env.BUILD_NUMBER}" \\
-e "PY_TEST_VERSIONS=${pythonVersion}" \\ -e "PY_TEST_VERSIONS=${pythonVersion}" \\
--entrypoint="script/test/ci" \\ --entrypoint="script/test/ci" \\
${imageName} \\ ${imageName} \\