Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use securedlab for daisy configuration
[releng.git]
/
jjb
/
opnfvdocs
/
opnfvdocs.yml
diff --git
a/jjb/opnfvdocs/opnfvdocs.yml
b/jjb/opnfvdocs/opnfvdocs.yml
index
2bf87c2
..
1295033
100644
(file)
--- a/
jjb/opnfvdocs/opnfvdocs.yml
+++ b/
jjb/opnfvdocs/opnfvdocs.yml
@@
-17,10
+17,10
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- -
colorado
:
+ -
danube
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled:
fals
e
+ disabled:
tru
e
########################
# job templates
########################
# job templates
@@
-34,7
+34,6
@@
parameters:
- project-parameter:
project: $GERRIT_PROJECT
parameters:
- project-parameter:
project: $GERRIT_PROJECT
- - gerrit-parameter:
branch: '{branch}'
- string:
name: GIT_CLONE_BASE
branch: '{branch}'
- string:
name: GIT_CLONE_BASE
@@
-42,13
+41,11
@@
description: "Used for overriding the GIT URL coming from parameters macro."
scm:
description: "Used for overriding the GIT URL coming from parameters macro."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
@@
-77,7
+74,6
@@
parameters:
- project-parameter:
project: $GERRIT_PROJECT
parameters:
- project-parameter:
project: $GERRIT_PROJECT
- - gerrit-parameter:
branch: '{branch}'
- string:
name: GIT_CLONE_BASE
branch: '{branch}'
- string:
name: GIT_CLONE_BASE
@@
-89,13
+85,11
@@
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- change-merged-event
- comment-added-contains-event:
trigger-on:
- change-merged-event
- comment-added-contains-event:
@@
-118,6
+112,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
@@
-126,16
+121,9
@@
name: GIT_CLONE_BASE
default: ssh://gerrit.opnfv.org:29418
description: "Used for overriding the GIT URL coming from parameters macro."
name: GIT_CLONE_BASE
default: ssh://gerrit.opnfv.org:29418
description: "Used for overriding the GIT URL coming from parameters macro."
- - string:
- name: GERRIT_BRANCH
- default: '{branch}'
- description: 'Specify the branch in this way in order to be able to use build-opnfv-composite-docs builder.'
scm:
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- timed: '0 H/6 * * *'
triggers:
- timed: '0 H/6 * * *'
@@
-143,4
+131,3
@@
builders:
- build-html-and-pdf-docs-output
# - upload-generated-docs-to-opnfv-artifacts
builders:
- build-html-and-pdf-docs-output
# - upload-generated-docs-to-opnfv-artifacts
-