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
Update validate autorelease projects for nitrogen
[releng/builder.git]
/
jjb
/
releng-templates.yaml
diff --git
a/jjb/releng-templates.yaml
b/jjb/releng-templates.yaml
index 802448ceab75de9fbb9046c7dd0f7e973895463a..422c8690dace1a0968c83c4254542b4c8bad98e2 100644
(file)
--- a/
jjb/releng-templates.yaml
+++ b/
jjb/releng-templates.yaml
@@
-42,7
+42,7
@@
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
- provide-maven-settings:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
- provide-maven-settings:
- global-settings-file: '
odl-
global-settings'
+ global-settings-file: 'global-settings'
settings-file: 'autorelease-settings'
- maven-target:
maven-version: 'mvn33'
settings-file: 'autorelease-settings'
- maven-target:
maven-version: 'mvn33'
@@
-57,7
+57,7
@@
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'autorelease-settings'
settings-type: cfp
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'autorelease-settings'
settings-type: cfp
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
global-settings-type: cfp
- releng-stage-release
global-settings-type: cfp
- releng-stage-release
@@
-65,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:
@@
-97,7
+96,7
@@
- releng-fetch-p2zip-if-necessary:
maven-version: 'mvn33'
settings: '{mvn-settings}'
- releng-fetch-p2zip-if-necessary:
maven-version: 'mvn33'
settings: '{mvn-settings}'
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
- releng-generate-p2pom
- maven-target:
maven-version: 'mvn33'
- releng-generate-p2pom
- maven-target:
maven-version: 'mvn33'
@@
-105,19
+104,18
@@
goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
settings: '{mvn-settings}'
settings-type: cfp
goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
settings: '{mvn-settings}'
settings-type: cfp
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
global-settings-type: cfp
- releng-update-p2composite-metadata:
maven-version: 'mvn33'
settings: '{mvn-settings}'
global-settings-type: cfp
- releng-update-p2composite-metadata:
maven-version: 'mvn33'
settings: '{mvn-settings}'
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
publishers:
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[releng]'
publishers:
- 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
@@
-174,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
@@
-184,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}'
@@
-201,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.
@@
-219,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
@@
-239,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:
@@
-275,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
@@
-339,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
@@
-354,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