Use fbot (jenkins-ci no longuer exists)

[releng.git] / jjb / releng / releng-release-create-branch.sh

diff --git a/jjb/releng/releng-release-create-branch.sh b/jjb/releng/releng-release-create-branch.sh
index 7e91d5a..beb493b 100644 (file)
--- a/jjb/releng/releng-release-create-branch.sh
+++ b/jjb/releng/releng-release-create-branch.sh
@@ -14,7 +14,7 @@ STREAM=${STREAM:-'nostream'}
 RELEASE_FILES=$(git diff HEAD^1 --name-only -- "releases/$STREAM")
 
 # Configure the git user/email as we'll be pushing up changes
-git config --global user.name "jenkins-ci"
+git config --global user.name "fbot"
 git config --global user.email "jenkins-opnfv-ci@opnfv.org"
 
 # Ensure we are able to generate Commit-IDs for new patchsets
@@ -44,8 +44,8 @@ fi
 run_merge(){
 unset NEW_FILES
 if [[ $REF_EXISTS = true && "$JOB_NAME" =~ "merge" ]]; then
-  ssh -n -f -p 29418 gerrit.opnfv.org gerrit create-branch "$repo" "$branch" "$ref"
-  python releases/scripts/create_jobs.py -f $release_file
+  ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' -n -f -p 29418 fbot@gerrit.opnfv.org gerrit create-branch "$repo" "$branch" "$ref"
+  python3 releases/scripts/create_jobs.py -f $release_file
   NEW_FILES=$(git status --porcelain --untracked=no | cut -c4-)
 fi
 if [ -n "$NEW_FILES" ]; then
@@ -65,7 +65,7 @@ for release_file in $RELEASE_FILES; do
         else
             run_merge
         fi
-    done < <(python releases/scripts/repos.py -b -f "$release_file")
+    done < <(python3 releases/scripts/repos.py -b -f "$release_file")
 done
 }