From 09ba101ce72922bf8664d6927eaf8da66348238e Mon Sep 17 00:00:00 2001 From: Julius Unverfehrt Date: Wed, 24 Aug 2022 15:22:10 +0200 Subject: [PATCH 1/2] Pull request #30: RED-5009 update pyinfra to support message rejection on unobtainable files Merge in RR/cv-analysis from RED-5009-update-pyinfra to master Squashed commit of the following: commit fe46f92494b7f00db2884e0f11cd1f4cc29d1675 Merge: 35d1675 95cab33 Author: Julius Unverfehrt Date: Wed Aug 24 15:20:16 2022 +0200 Merge branch 'master' of ssh://git.iqser.com:2222/rr/cv-analysis into RED-5009-update-pyinfra commit 35d16759eb747467ce8deb88f8d953da0d4dc630 Author: Julius Unverfehrt Date: Wed Aug 24 15:19:41 2022 +0200 RED-5009 update pyinfra to support message rejection on unobtainable files --- incl/pyinfra | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incl/pyinfra b/incl/pyinfra index 71ad2af..88b4c5c 160000 --- a/incl/pyinfra +++ b/incl/pyinfra @@ -1 +1 @@ -Subproject commit 71ad2af4eb278a3718ad5385b06f07faa9059e9f +Subproject commit 88b4c5c7ce9852b8aa4bdd6b760f4c8b708df62b From 7706cfe9730846c670b9de09f292947382cbeaa0 Mon Sep 17 00:00:00 2001 From: Christoph Schabert Date: Tue, 20 Sep 2022 11:56:35 +0200 Subject: [PATCH 2/2] Pull request #31: hotfix: fix key prepare Merge in RR/cv-analysis from hotfix/keyPrep to master Squashed commit of the following: commit 58961a319b985cb5d658d867459340eafc0e7c04 Author: cschabert Date: Tue Sep 20 11:25:15 2022 +0200 hotfix: fix key prepare commit d937ff7c7d5824e8a75956102bfe7cf24fb27305 Author: Julius Unverfehrt Date: Wed Aug 24 15:22:10 2022 +0200 Pull request #30: RED-5009 update pyinfra to support message rejection on unobtainable files Merge in RR/cv-analysis from RED-5009-update-pyinfra to master Squashed commit of the following: commit fe46f92494b7f00db2884e0f11cd1f4cc29d1675 Merge: 35d1675 95cab33 Author: Julius Unverfehrt Date: Wed Aug 24 15:20:16 2022 +0200 Merge branch 'master' of ssh://git.iqser.com:2222/rr/cv-analysis into RED-5009-update-pyinfra commit 35d16759eb747467ce8deb88f8d953da0d4dc630 Author: Julius Unverfehrt Date: Wed Aug 24 15:19:41 2022 +0200 RED-5009 update pyinfra to support message rejection on unobtainable files --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 7 ++----- bamboo-specs/src/main/resources/scripts/key-prepare.sh | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 2b1e23f..2d1967e 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/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) diff --git a/bamboo-specs/src/main/resources/scripts/key-prepare.sh b/bamboo-specs/src/main/resources/scripts/key-prepare.sh index 715b13a..bf71668 100755 --- a/bamboo-specs/src/main/resources/scripts/key-prepare.sh +++ b/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 \ No newline at end of file