Merge pull request #31810 from vespa-engine/aressem/no-git-setup-in-s…

…cripts Git setup done elsewhere and fix env var name.
vespa-engine · Jul 2, 2024 · 1734978 · 1734978
2 parents da6678c + 20f8e16
commit 1734978
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/screwdriver/release-rpms.sh b/screwdriver/release-rpms.sh
@@ -30,14 +30,10 @@ if [[ "$VESPA_RELEASE" == "$VESPA_RPM_X86_64" ]] &&  [[ "$VESPA_RELEASE" == "$VE
 fi
 
 echo "Using vespa repository git reference: $VESPA_REF"
-mkdir -p ~/.ssh
-ssh-keyscan github.com >> ~/.ssh/known_hosts
 ssh-add -D
 set +x
 ssh-add <(echo $VESPA_DEPLOY_TOKEN | base64 -d)
 set -x
-git config --global user.email "[email protected]"
-git config --global user.name "Vespa Builder"
 git clone [email protected]:vespa-engine/vespa
 
 cd vespa

diff --git a/screwdriver/update-vespa-version-in-sample-apps.sh b/screwdriver/update-vespa-version-in-sample-apps.sh
@@ -46,7 +46,7 @@ function wait_until_published {
 
 ssh-add -D
 set +x
-ssh-add <(echo $SAMPLE_APPS_DEPLOY_KEY | base64 -d)
+ssh-add <(echo $SAMPLE_APPS_DEPLOY_TOKEN | base64 -d)
 set -x
 
 git clone [email protected]:vespa-engine/sample-apps.git