From 0147f3585376a01073148880f36cf1ef8d6c7bda Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 23 Oct 2018 10:41:06 +0200 Subject: [PATCH] Move ssh-credentials-id into git-scm Change-Id: I86203a93593de5525f0b0ec2d5dabaed994aef19 Signed-off-by: Fatih Degirmenci --- jjb/datafile/datafile-verify-jobs.yaml | 3 +-- jjb/infra/jjb-merge-jobs.yaml | 3 +-- jjb/infra/jjb-verify-jobs.yaml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/jjb/datafile/datafile-verify-jobs.yaml b/jjb/datafile/datafile-verify-jobs.yaml index 3a5829429..24fa677cb 100644 --- a/jjb/datafile/datafile-verify-jobs.yaml +++ b/jjb/datafile/datafile-verify-jobs.yaml @@ -12,7 +12,6 @@ stream: - nordix-dev: branch: '{stream}' - ssh-credentials-id: nordixinfra-nordix-gerrit-ssh jobs: - '{project-name}-{stream}-verify-java' @@ -51,7 +50,7 @@ scm: - git-scm-gerrit: - ssh-credentials-id: '{ssh-credentials-id}' + ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC diff --git a/jjb/infra/jjb-merge-jobs.yaml b/jjb/infra/jjb-merge-jobs.yaml index cbd58155d..ccbaf6b2d 100644 --- a/jjb/infra/jjb-merge-jobs.yaml +++ b/jjb/infra/jjb-merge-jobs.yaml @@ -11,7 +11,6 @@ stream: - master: branch: '{stream}' - ssh-credentials-id: nordixinfra-nordix-gerrit-ssh jobs: - infra-jjb-merge-{stream} @@ -35,7 +34,7 @@ scm: - git-scm: - ssh-credentials-id: '{ssh-credentials-id}' + ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' diff --git a/jjb/infra/jjb-verify-jobs.yaml b/jjb/infra/jjb-verify-jobs.yaml index 22d81af46..2d2a3605c 100644 --- a/jjb/infra/jjb-verify-jobs.yaml +++ b/jjb/infra/jjb-verify-jobs.yaml @@ -11,7 +11,6 @@ stream: - master: branch: '{stream}' - ssh-credentials-id: nordixinfra-nordix-gerrit-ssh jobs: - infra-jjb-verify-{stream} @@ -35,7 +34,7 @@ scm: - git-scm-gerrit: - ssh-credentials-id: '{ssh-credentials-id}' + ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC -- 2.25.1