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 "Push OpFlex artifacts to Nexus repository."
[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 8b7d1f36d04019316c5f5d5fe3201c40d73d1de1..ab8f5c76294d12c747a0f12604f8fd2e86868647 100644
(file)
--- a/
jjb/netvirt/netvirt-full-integration.yaml
+++ b/
jjb/netvirt/netvirt-full-integration.yaml
@@
-5,8
+5,11
@@
- 'netvirt-daily-full-integration-{stream}'
stream:
- 'netvirt-daily-full-integration-{stream}'
stream:
- -
nitro
gen:
+ -
oxy
gen:
branch: 'master'
branch: 'master'
+ jdk: 'openjdk8'
+ - nitrogen:
+ branch: 'stable/nitrogen'
jre: 'openjdk8'
- carbon:
branch: 'stable/carbon'
jre: 'openjdk8'
- carbon:
branch: 'stable/carbon'
@@
-20,12
+23,6
@@
jdks:
- openjdk8
karaf-version: karaf3
jdks:
- openjdk8
karaf-version: karaf3
- - beryllium:
- branch: 'stable/beryllium'
- jdk: openjdk8
- jdks:
- - openjdk8
- karaf-version: karaf3
project: 'netvirt'
archive-artifacts: '*.log **/target/surefire-reports/*.txt'
project: 'netvirt'
archive-artifacts: '*.log **/target/surefire-reports/*.txt'
@@
-52,7
+49,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:
@@
-77,7
+74,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:
@@
-115,8
+112,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:
@@
-136,14
+134,14
@@
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}'
- job-template:
name: 'netvirt-daily-full-integration-{stream}'
@@
-210,7
+208,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: