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 "Remove sxp carbon jobs"
[releng/builder.git]
/
jjb
/
netvirt
/
netvirt-full-integration.yaml
diff --git
a/jjb/netvirt/netvirt-full-integration.yaml
b/jjb/netvirt/netvirt-full-integration.yaml
index b8e0f72b1967db596b0e312a0549d7b652da8cb5..8cf106f8837c77fc3c00813402df58e71e900594 100644
(file)
--- a/
jjb/netvirt/netvirt-full-integration.yaml
+++ b/
jjb/netvirt/netvirt-full-integration.yaml
@@
-5,24
+5,12
@@
- 'netvirt-daily-full-integration-{stream}'
stream:
- 'netvirt-daily-full-integration-{stream}'
stream:
- -
nitrogen
:
+ -
fluorine
:
branch: 'master'
branch: 'master'
- jre: 'openjdk8'
- - carbon:
- branch: 'stable/carbon'
- jdk: openjdk8
- jdks:
- - openjdk8
- - boron:
- branch: 'stable/boron'
- jdk: openjdk8
- jdks:
- - openjdk8
- - beryllium:
- branch: 'stable/beryllium'
- jdk: openjdk8
- jdks:
- - openjdk8
+ - oxygen:
+ branch: 'stable/oxygen'
+ - nitrogen:
+ branch: 'stable/nitrogen'
project: 'netvirt'
archive-artifacts: '*.log **/target/surefire-reports/*.txt'
project: 'netvirt'
archive-artifacts: '*.log **/target/surefire-reports/*.txt'
@@
-49,7
+37,7
@@
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'netvirt-settings'
settings-type: cfp
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'netvirt-settings'
settings-type: cfp
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
global-settings-type: cfp
- builder:
global-settings-type: cfp
- builder:
@@
-74,7
+62,7
@@
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'netvirt-settings'
settings-type: cfp
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'netvirt-settings'
settings-type: cfp
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
global-settings-type: cfp
- builder:
global-settings-type: cfp
- builder:
@@
-112,8
+100,9
@@
- shell: |
virtualenv $WORKSPACE/venv
source $WORKSPACE/venv/bin/activate
- shell: |
virtualenv $WORKSPACE/venv
source $WORKSPACE/venv/bin/activate
- pip install --upgrade pip
- pip install docker-compose
+ PYTHON="$WORKSPACE/venv/bin/python"
+ $PYTHON -m pip install --upgrade pip
+ $PYTHON -m pip install docker-compose
- builder:
- builder:
@@
-133,22
+122,22
@@
OVS_VERSION: '{OVS_VERSION}'
maven-version: '{maven-version}'
stream: '{stream}'
OVS_VERSION: '{OVS_VERSION}'
maven-version: '{maven-version}'
stream: '{stream}'
- - shell: !include-raw-escape:
include-raw-
setup-docker.sh
+ - shell: !include-raw-escape: setup-docker.sh
- inject:
properties-file: env.properties
- run-netvirt-sfc-it:
OVS_VERSION: '{OVS_VERSION}'
maven-version: '{maven-version}'
stream: '{stream}'
- inject:
properties-file: env.properties
- run-netvirt-sfc-it:
OVS_VERSION: '{OVS_VERSION}'
maven-version: '{maven-version}'
stream: '{stream}'
- - shell: !include-raw-escape:
include-raw-
cleanup-docker.sh
+ - shell: !include-raw-escape: cleanup-docker.sh
- job-template:
name: 'netvirt-daily-full-integration-{stream}'
project-type: freestyle
- job-template:
name: 'netvirt-daily-full-integration-{stream}'
project-type: freestyle
- node: centos7-docker-
2
c-4g
+ node: centos7-docker-
1
c-4g
concurrent: true
concurrent: true
- jdk: '{j
dk
}'
+ jdk: '{j
ava-version
}'
description: >
Integration tests for the Netvirt project against different versions of
OVS and branches. This job runs nightly.
description: >
Integration tests for the Netvirt project against different versions of
OVS and branches. This job runs nightly.
@@
-177,7
+166,7
@@
triggers:
- gerrit:
triggers:
- gerrit:
- server-name: '{server-name}'
+ server-name: '{
gerrit-
server-name}'
trigger-on:
- comment-added-contains-event:
comment-contains-value: 'runit'
trigger-on:
- comment-added-contains-event:
comment-contains-value: 'runit'
@@
-207,7
+196,7
@@
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'netvirt-settings'
settings-type: cfp
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'netvirt-settings'
settings-type: cfp
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
global-settings-type: cfp
# skip 2.4.0 until we figure out conntrack
# - run-netvirt-it:
global-settings-type: cfp
# skip 2.4.0 until we figure out conntrack
# - run-netvirt-it:
@@
-230,5
+219,4
@@
succeed-if-found: false
unstable-if-found: true
also-check-console-output: false
succeed-if-found: false
unstable-if-found: true
also-check-console-output: false
- - opendaylight-infra-shiplogs:
- maven-version: 'mvn33'
+ - lf-infra-publish