Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Revert "Increase packer job timeout to 120 minutes""
[releng/builder.git]
/
jjb
/
releng-templates.yaml
diff --git
a/jjb/releng-templates.yaml
b/jjb/releng-templates.yaml
index 66bdd8b9de1136f47a58029ee4d5de3076cb823a..0971a1f8e3ff81e5a55834c61522c353a0914531 100644
(file)
--- a/
jjb/releng-templates.yaml
+++ b/
jjb/releng-templates.yaml
@@
-15,6
+15,7
@@
parameters:
- opendaylight-infra-parameters:
parameters:
- opendaylight-infra-parameters:
+ os-cloud: '{os-cloud}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
@@
-64,8
+65,7
@@
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[releng]'
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[releng]'
- - opendaylight-infra-shiplogs:
- maven-version: 'mvn33'
+ - lf-infra-publish
- job-template:
- job-template:
@@
-79,6
+79,7
@@
parameters:
- opendaylight-infra-parameters:
parameters:
- opendaylight-infra-parameters:
+ os-cloud: '{os-cloud}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
@@
-114,8
+115,7
@@
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[releng]'
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[releng]'
- - opendaylight-infra-shiplogs:
- maven-version: 'mvn33'
+ - lf-infra-publish
# Generic tox-based verify action
# Generic tox-based verify action
@@
-138,6
+138,7
@@
parameters:
- opendaylight-infra-parameters:
parameters:
- opendaylight-infra-parameters:
+ os-cloud: '{os-cloud}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
@@
-153,6
+154,8
@@
- 'origin/$GERRIT_BRANCH'
skip-tag: true
choosing-strategy: 'gerrit'
- 'origin/$GERRIT_BRANCH'
skip-tag: true
choosing-strategy: 'gerrit'
+ submodule:
+ recursive: true
wrappers:
- opendaylight-infra-wrappers:
wrappers:
- opendaylight-infra-wrappers:
@@
-169,9
+172,10
@@
- shell: |
virtualenv $WORKSPACE/venv-tox
source $WORKSPACE/venv-tox/bin/activate
- shell: |
virtualenv $WORKSPACE/venv-tox
source $WORKSPACE/venv-tox/bin/activate
- pip install --upgrade pip
- pip install --upgrade tox argparse
- pip freeze
+ PYTHON="$WORKSPACE/venv-tox/bin/python"
+ $PYTHON -m pip install --upgrade pip
+ $PYTHON -m pip install --upgrade tox argparse
+ $PYTHON -m pip freeze
cd $WORKSPACE/repo/{toxdir}
tox
cd $WORKSPACE/repo/{toxdir}
tox
@@
-179,8
+183,7
@@
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project}]'
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project}]'
- - opendaylight-infra-shiplogs:
- maven-version: 'mvn33'
+ - lf-infra-publish
- job-template:
name: '{project-name}-verify-tox-{stream}'
- job-template:
name: '{project-name}-verify-tox-{stream}'
@@
-196,6
+199,8
@@
# toxdir: directory containing the project's tox.ini relative to
# the workspace. Empty works if tox.ini is at project root.
# toxdir: directory containing the project's tox.ini relative to
# the workspace. Empty works if tox.ini is at project root.
+ build-node: centos7-java-builder-2c-4g
+
<<: *tox_builder_verify
# Specification for projects outside release cycle, to avoid referring a stream.
<<: *tox_builder_verify
# Specification for projects outside release cycle, to avoid referring a stream.
@@
-214,6
+219,7
@@
# toxdir: directory containing the project's tox.ini relative to
# the workspace. Empty works if tox.ini is at project root.
# toxdir: directory containing the project's tox.ini relative to
# the workspace. Empty works if tox.ini is at project root.
+ build-node: centos7-java-builder-2c-4g
branch: master
<<: *tox_builder_verify
branch: master
<<: *tox_builder_verify
@@
-234,6
+240,8
@@
# toxdir: directory containing the project's tox.ini relative to
# the workspace. Empty works if tox.ini is at project root.
# toxdir: directory containing the project's tox.ini relative to
# the workspace. Empty works if tox.ini is at project root.
+ build-node: centos7-java-builder-2c-4g
+
<<: *tox_builder_verify
- job-template:
<<: *tox_builder_verify
- job-template:
@@
-246,6
+254,7
@@
parameters:
- opendaylight-infra-parameters:
parameters:
- opendaylight-infra-parameters:
+ os-cloud: '{os-cloud}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
@@
-269,8
+278,7
@@
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project}]'
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project}]'
- - opendaylight-infra-shiplogs:
- maven-version: 'mvn33'
+ - lf-infra-publish
# Node related
# Node related
@@
-299,6
+307,7
@@
parameters:
- opendaylight-infra-parameters:
parameters:
- opendaylight-infra-parameters:
+ os-cloud: '{os-cloud}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
@@
-332,9
+341,10
@@
# Prepare Python
virtualenv $WORKSPACE/venv-python
source $WORKSPACE/venv-python/bin/activate
# Prepare Python
virtualenv $WORKSPACE/venv-python
source $WORKSPACE/venv-python/bin/activate
- pip install --upgrade pip
- pip install --upgrade tox argparse nodeenv
- pip freeze
+ PYTHON="$WORKSPACE/venv-python/bin/python"
+ $PYTHON -m pip install --upgrade pip
+ $PYTHON -m pip install --upgrade tox argparse nodeenv
+ $PYTHON -m pip freeze
# Prepare node
nodeenv --node={nodever} --prebuilt $WORKSPACE/venv-node
# Prepare node
nodeenv --node={nodever} --prebuilt $WORKSPACE/venv-node
@@
-347,5
+357,4
@@
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project}]'
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project}]'
- - opendaylight-infra-shiplogs:
- maven-version: 'mvn33'
+ - lf-infra-publish