X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fjjb-macros.yaml;h=e4f23a2d29f098b661fb1d8251554be31dfcf9c1;hb=f1d961094e297e6de6b3b9d2871e243560e39d79;hp=fecd95547b178dbec377f5aa3e0708344e39e75c;hpb=2c4038ba9caed723e5942ccf9f800af7c001a108;p=infra%2Fcicd.git diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index fecd95547..e4f23a2d2 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -1,7 +1,7 @@ --- # these parameters are used for infra related variables - parameter: - name: infra-parameter + name: infra-parameters parameters: - string: name: JJB_GIT_REPO @@ -14,7 +14,7 @@ # these parameters are used for setting the Gerrit Project on Nordix - parameter: - name: project-parameter + name: project-parameters parameters: - string: name: PROJECT @@ -73,7 +73,7 @@ name: git-scm scm: - git: &git-scm-defaults - url: '$GIT_BASE_HTTPS' + url: '$GIT_BASE_HTTPS/$PROJECT' branches: - 'origin/$BRANCH' timeout: 15 @@ -142,3 +142,13 @@ file-paths: - compare-type: 'ANT' pattern: '{files}' + +# wrappers to use for jobs +- wrapper: + name: nordixinfra-jjb-creds-wrapper + wrappers: + - credentials-binding: + - username-password-separated: + credential-id: nordixinfra-jjb-creds + username: JJB_USERNAME + password: JJB_USERTOKEN