diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2016-09-16 22:09:14 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2016-09-16 22:50:26 +0200 |
| commit | de90e79c541db66a73876bd880c8ff25c36d6d85 (patch) | |
| tree | 4fc9cad8e482a87124fd831a280a93cb6fa62653 | |
| parent | 5f42a16fc0bb19de3d6824af557828348af1c3db (diff) | |
Port git.automotivelinux.org
Change-Id: Ied6b00f01bc8e3eace843c6a8336bc9b74c9980c
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
| -rwxr-xr-x | jenkins-scripts/basic_settings.sh | 2 | ||||
| -rw-r--r-- | jjb/ci-management/include-raw-jjb-update.sh | 2 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh index 0240ec24..66dcc978 100755 --- a/jenkins-scripts/basic_settings.sh +++ b/jenkins-scripts/basic_settings.sh @@ -41,7 +41,7 @@ Host 10.30.96.* 10.30.97.* EOSSH cat <<EOKNOWN > /etc/ssh/ssh_known_hosts -[gerrit-new.automotivelinux.org]:39418,[198.145.29.87]:39418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLlq8OD28YY+RRU2rcBxV0agWQsgD+ywpObFtjO0uxhxWWz0wtJdu0NDGpFH9AFE64AeBx7NFIYjuXWtWQIwSHgXyx0hejL9257YWsQ8dPsnEsUT6PehE68MA1eg4S5lT/9NjVeAhWgPBVNdtcP0oex2Pf/qr6aKZVUq9msemzZHAVmBKKHTFQTePW50JObQyXHQTSB572OV/haVob+3k6EQrtFdD3dg3/KDvgtuIjmW+Bp7amT7ZwtL0ekCWZqM6V8M1tqsy0WaJJhdjDf/Tc4d+wGNXFnU5niVDbBdlFVqQSVgGuSNIbu/y9ZRF14dOe97YMykxCJk7fDnsjdnmR +[gerrit.automotivelinux.org]:29418,[198.145.29.87]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC7mx+OxVdwr6s5M/JJn5DxxVu9n7dfIZrB+mS88m51oJmHCWDBGEncpUskrzAwI5uXYTeG4FamcxtrHumVL3oZ6F4m93DG486/LM/4ff8qbEjYNoYYqY004wW2kbg1ivZ/DWmIyAyw0JCOv+Ia39krT5Zv6LI68skimCE/6pRbsw== EOKNOWN # vim: sw=2 ts=2 sts=2 et : diff --git a/jjb/ci-management/include-raw-jjb-update.sh b/jjb/ci-management/include-raw-jjb-update.sh index 73d1fa91..26941877 100644 --- a/jjb/ci-management/include-raw-jjb-update.sh +++ b/jjb/ci-management/include-raw-jjb-update.sh @@ -6,5 +6,5 @@ function submitJJB { git push origin HEAD:refs/for/master } -gitdir=$(git rev-parse --git-dir); scp -p -P 39418 agl-jenkins-gerrit-user@gerrit-new.automotivelinux.org:hooks/commit-msg ${gitdir}/hooks/ +gitdir=$(git rev-parse --git-dir); scp -p -P 29418 agl-jenkins-gerrit-user@gerrit.automotivelinux.org:hooks/commit-msg ${gitdir}/hooks/ git diff --exit-code || submitJJB diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 602d07fb..e967dc37 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -79,7 +79,7 @@ name: gerrit-trigger-patch-submitted triggers: - gerrit: - server-name: 'gerrit-new.automotivelinux.org' + server-name: 'gerrit.automotivelinux.org' trigger-on: - patchset-created-event: exclude-drafts: 'false' @@ -101,7 +101,7 @@ name: gerrit-trigger-patch-merged triggers: - gerrit: - server-name: 'gerrit-new.automotivelinux.org' + server-name: 'gerrit.automotivelinux.org' trigger-on: - change-merged-event - comment-added-contains-event: @@ -117,7 +117,7 @@ name: gerrit-trigger-silent-patch-submitted triggers: - gerrit: - server-name: 'gerrit-new.automotivelinux.org' + server-name: 'gerrit.automotivelinux.org' trigger-on: - patchset-created-event: exclude-drafts: 'false' @@ -140,7 +140,7 @@ name: gerrit-trigger-silent-full-check triggers: - gerrit: - server-name: 'gerrit-new.automotivelinux.org' + server-name: 'gerrit.automotivelinux.org' trigger-on: - comment-added-contains-event: comment-contains-value: 'fullcheck' @@ -156,7 +156,7 @@ name: gerrit-trigger-silent-patch-merged triggers: - gerrit: - server-name: 'gerrit-new.automotivelinux.org' + server-name: 'gerrit.automotivelinux.org' trigger-on: - change-merged-event - comment-added-contains-event: @@ -173,7 +173,7 @@ name: gerrit-trigger-tag triggers: - gerrit: - server-name: 'gerrit-new.automotivelinux.org' + server-name: 'gerrit.automotivelinux.org' trigger-on: - ref-updated-event projects: |