Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add jjb credentials to infra-jjb-verify
[infra/cicd.git]
/
jjb
/
global
/
jjb-macros.yaml
diff --git
a/jjb/global/jjb-macros.yaml
b/jjb/global/jjb-macros.yaml
index cfe19edf2d938fec5c727acb1f0c98ea8bef85af..e4f23a2d29f098b661fb1d8251554be31dfcf9c1 100644
(file)
--- 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:
---
# these parameters are used for infra related variables
- parameter:
- name: infra-parameter
+ name: infra-parameter
s
parameters:
- string:
name: JJB_GIT_REPO
parameters:
- string:
name: JJB_GIT_REPO
@@
-14,12
+14,16
@@
# these parameters are used for setting the Gerrit Project on Nordix
- parameter:
# these parameters are used for setting the Gerrit Project on Nordix
- parameter:
- name: project-parameter
+ name: project-parameter
s
parameters:
- string:
name: PROJECT
default: '{project}'
description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
parameters:
- string:
name: PROJECT
default: '{project}'
description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
+ - string:
+ name: BRANCH
+ default: '{branch}'
+ description: "JJB configured BRANCH parameter (e.g. master, nordix-dev)"
# these parameters are used for streaming changes from various Gerrit Systems
- parameter:
# these parameters are used for streaming changes from various Gerrit Systems
- parameter:
@@
-69,7
+73,7
@@
name: git-scm
scm:
- git: &git-scm-defaults
name: git-scm
scm:
- git: &git-scm-defaults
- url: '$GIT_BASE_HTTPS'
+ url: '$GIT_BASE_HTTPS
/$PROJECT
'
branches:
- 'origin/$BRANCH'
timeout: 15
branches:
- 'origin/$BRANCH'
timeout: 15
@@
-138,3
+142,13
@@
file-paths:
- compare-type: 'ANT'
pattern: '{files}'
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