diff --git a/Jenkinsfile b/Jenkinsfile index 6200705..a5fd3af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,4 @@ +@Library('SHS.Platforms') _ def build_docker(docker_image, docker_dir, release_dir) { def image_name = "${docker_image}-shstk" echo "Build image ${image_name}" @@ -20,27 +21,23 @@ node { checkout scm } - stage("Download platforms.json") { - sh "rm -rf platforms" - sh "git clone --depth 1 ${env.PLATFORMS_GIT} platforms" - } + def pl = new org.SHS.Platforms(this) + pl.get() def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' echo "Release to ${rel_dir}" sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" - def root = readJSON(file: 'platforms/platforms.json') def _msg = "Built images:" - root.Platforms.each { key, dist -> - if (dist.enabled) { - stage ("${key}-shstk") { - _msg += build_docker(dist.docker_image, dist.docker_dir, rel_dir) - } - } + pl.forEach ({ dist -> + _msg += build_docker(dist.docker_image, dist.docker_dir, rel_dir) + }, stageSuffix: "-shstk") + + stage("Clean") { + sh "docker system prune -f" } - sh "docker system prune -f" archiveArtifacts 'release/*' echo "${_msg}" } diff --git a/pip b/pip index 0f19719..f503e85 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 0f19719a9837f395a4c925ccb17b1112e901f92f +Subproject commit f503e85507dedf63752711bd4583ef3d98307b88