From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 29 Sep 2023 19:02:22 +0000 (+0200)
Subject: Call fbot instead of jenkins-ci
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=c8bcbab71b721fb658567de7ed64a0bef2e84321;p=releng.git

Call fbot instead of jenkins-ci

Change-Id: I479d3618f2c65ba4114c04992e78ee25fcc01159
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index 89effa1c7..ea48cc80d 100644
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -359,7 +359,7 @@
               cat gerrit_comment.txt
               echo
               ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' \
-                  -p 29418 jenkins-ci@gerrit.opnfv.org \
+                  -p 29418 fbot@gerrit.opnfv.org \
                   "gerrit review -p $GERRIT_PROJECT \
                    -m '$(cat gerrit_comment.txt)' \
                    $GERRIT_PATCHSET_REVISION \
diff --git a/jjb/releng/releng-release-create-branch.sh b/jjb/releng/releng-release-create-branch.sh
index 917a4c721..cef870cc4 100644
--- a/jjb/releng/releng-release-create-branch.sh
+++ b/jjb/releng/releng-release-create-branch.sh
@@ -44,7 +44,7 @@ fi
 run_merge(){
 unset NEW_FILES
 if [[ $REF_EXISTS = true && "$JOB_NAME" =~ "merge" ]]; then
-  ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' -n -f -p 29418 jenkins-ci@gerrit.opnfv.org gerrit create-branch "$repo" "$branch" "$ref"
+  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