Merge branch 'master' of ssh://git.iqser.com:2222/rr/cv-analysis into optimize_layout_detection

bamboo-specs/src/main/java/buildjob/PlanSpec.java

@@ -95,11 +95,8 @@ public class PlanSpec {
                         .checkoutItems(new CheckoutItem().defaultRepository()),
                     new ScriptTask()
                         .description("Set config and keys.")
-                        .inlineBody("mkdir -p ~/.ssh\n" +
-                                    "echo \"${bamboo.bamboo_agent_ssh}\" | base64 -d >> ~/.ssh/id_rsa\n" +
-                                    "echo \"host vector.iqser.com\" > ~/.ssh/config\n" +
-                                    "echo \"    user bamboo-agent\" >> ~/.ssh/config\n" +
-                                    "chmod 600 ~/.ssh/config ~/.ssh/id_rsa"),
+                        .location(Location.FILE)
+                        .fileFromPath("bamboo-specs/src/main/resources/scripts/key-prepare.sh"),
                     new ScriptTask()
                         .description("Build Docker container.")
                         .location(Location.FILE)

bamboo-specs/src/main/resources/scripts/key-prepare.sh

@@ -2,7 +2,7 @@
 set -e
 
 mkdir -p ~/.ssh
-echo "${bamboo.bamboo_agent_ssh}" | base64 -d >> ~/.ssh/id_rsa
+echo "${bamboo_agent_ssh}" | base64 -d >> ~/.ssh/id_rsa
 echo "host vector.iqser.com" > ~/.ssh/config
 echo "    user bamboo-agent" >> ~/.ssh/config
 chmod 600 ~/.ssh/config ~/.ssh/id_rsa

incl/pyinfra

@@ -1 +1 @@
-Subproject commit 71ad2af4eb278a3718ad5385b06f07faa9059e9f
+Subproject commit 88b4c5c7ce9852b8aa4bdd6b760f4c8b708df62b