From 7b13bba14b93f6ea3d11692872ba9e009f937eef Mon Sep 17 00:00:00 2001
From: Andrey Bychkov <andrey@signalmodelling.ru>
Date: Mon, 24 Apr 2023 15:49:25 +0300
Subject: [PATCH 1/2] Jenkinsfile small clean

---
 Jenkinsfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6200705..1b64f6e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,9 @@ def build_docker(docker_image, docker_dir, release_dir) {
 	}
 	return "\n - ${image_name}"
 }
+
 properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]);
+
 node {
 	stage("Download SRC") {
 		checkout scm
@@ -40,7 +42,10 @@ node {
 		}
 	}
 
-	sh "docker system prune -f"
+    stage("Clean") {
+	    sh "docker system prune -f"
+	}
+
 	archiveArtifacts 'release/*'
 	echo "${_msg}"
 }

From 16287ca510f17a3d9ab6753285ee28b273211a9f Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Tue, 25 Apr 2023 16:37:56 +0300
Subject: [PATCH 2/2] Jenkinsfile, pip

---
 Jenkinsfile | 24 ++++++++----------------
 pip         |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1b64f6e..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}"
@@ -14,36 +15,27 @@ def build_docker(docker_image, docker_dir, release_dir) {
 	}
 	return "\n - ${image_name}"
 }
-
 properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]);
-
 node {
 	stage("Download SRC") {
 		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"
+	stage("Clean") {
+		sh "docker system prune -f"
 	}
 
 	archiveArtifacts 'release/*'
diff --git a/pip b/pip
index 0f19719..f503e85 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit 0f19719a9837f395a4c925ccb17b1112e901f92f
+Subproject commit f503e85507dedf63752711bd4583ef3d98307b88