Marmelator/cv-analysis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 37 Wiki Activity

Pull request #31: hotfix: fix key prepare

Browse Source 
Merge in RR/cv-analysis from hotfix/keyPrep to master

Squashed commit of the following:

commit 58961a319b985cb5d658d867459340eafc0e7c04
Author: cschabert <christoph.schabert@iqser.com>
Date:   Tue Sep 20 11:25:15 2022 +0200

    hotfix: fix key prepare

commit d937ff7c7d5824e8a75956102bfe7cf24fb27305
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
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 <julius.unverfehrt@iqser.com>
    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 <julius.unverfehrt@iqser.com>
    Date:   Wed Aug 24 15:19:41 2022 +0200

        RED-5009 update pyinfra to support message rejection on unobtainable files
This commit is contained in:
Christoph Schabert 2022-09-20 11:56:35 +02:00 committed by Julius Unverfehrt
parent 09ba101ce7
commit 7706cfe973
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bamboo-specs/src/main/java/buildjob/PlanSpec.java
View File

@ -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)

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

@ -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