Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Optimize Functest K8s job filters"
[releng.git]
/
jjb
/
functest
/
xtesting-pi.yaml
diff --git
a/jjb/functest/xtesting-pi.yaml
b/jjb/functest/xtesting-pi.yaml
index
3fbfaf0
..
cf3d2ba
100644
(file)
--- a/
jjb/functest/xtesting-pi.yaml
+++ b/
jjb/functest/xtesting-pi.yaml
@@
-12,52
+12,46
@@
port:
tag:
- latest:
port:
tag:
- latest:
- slave: lf-virtual1
+ node: xtesting
+ - zed:
+ node: xtesting
+ - yoga:
+ node: xtesting
- xena:
- xena:
- slave: lf-virtual1
+ node: xtesting
- wallaby:
- wallaby:
- slave: lf-virtual1
- - leguer:
- slave: lf-virtual1
- - kali:
- slave: lf-virtual1
- - jerma:
- slave: lf-virtual1
+ node: xtesting
- arm-latest:
- arm-latest:
- slave: lf-virtual1
+ node: xtesting
+ - arm-zed:
+ node: xtesting
+ - arm-yoga:
+ node: xtesting
- arm-xena:
- arm-xena:
- slave: lf-virtual1
+ node: xtesting
- arm-wallaby:
- arm-wallaby:
- slave: lf-virtual1
- - arm-leguer:
- slave: lf-virtual1
- - arm-kali:
- slave: lf-virtual1
- - arm-jerma:
- slave: lf-virtual1
+ node: xtesting
- arm64-latest:
- arm64-latest:
- slave: lf-virtual1
+ node: xtesting
+ - arm64-zed:
+ node: xtesting
+ - arm64-yoga:
+ node: xtesting
- arm64-xena:
- arm64-xena:
- slave: lf-virtual1
+ node: xtesting
- arm64-wallaby:
- arm64-wallaby:
- slave: lf-virtual1
- - arm64-leguer:
- slave: lf-virtual1
- - arm64-kali:
- slave: lf-virtual1
- - arm64-jerma:
- slave: lf-virtual1
+ node: xtesting
- xtesting-pi-jobs: &xtesting-pi-jobs
name: 'xtesting-pi-jobs'
current-parameters: true
- parameter:
- xtesting-pi-jobs: &xtesting-pi-jobs
name: 'xtesting-pi-jobs'
current-parameters: true
- parameter:
- name: xtesting-pi-
slav
e
+ name: xtesting-pi-
nod
e
parameters:
- label:
parameters:
- label:
- name:
slav
e
- default: '{
slav
e}'
+ name:
nod
e
+ default: '{
nod
e}'
- parameter:
name: xtesting-pi-build_tag
- parameter:
name: xtesting-pi-build_tag
@@
-75,6
+69,7
@@
network: '{network}'
uid: '{uid}'
gid: '{gid}'
network: '{network}'
uid: '{uid}'
gid: '{gid}'
+ published_ports: '{published_ports}'
- builder:
name: xtesting-pi-pull-containers
- builder:
name: xtesting-pi-pull-containers
@@
-105,6
+100,11
@@
for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
do env="-e $i $env"; done
fi
for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
do env="-e $i $env"; done
fi
+ published_ports=;
+ if [ "{published_ports}" != "None" ]; then
+ for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+ do published_ports="-p $i $published_ports"; done
+ fi
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@
-120,13
+120,14
@@
--network={network} \
$volumes \
$env \
--network={network} \
$volumes \
$env \
+ $published_ports \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
- -v /home/opnfv/xtesting/.boto:/
root/.boto
\
+ -v /home/opnfv/xtesting/.boto:/
etc/boto.cfg
\
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
- -e NODE_NAME=$
slav
e \
+ -e NODE_NAME=$
nod
e \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
$image run_tests -t {test} -p -r
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
$image run_tests -t {test} -p -r
@@
-148,8
+149,8
@@
- job-template:
name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
parameters:
- job-template:
name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
parameters:
- - xtesting-pi-
slav
e:
-
slave: '{slav
e}'
+ - xtesting-pi-
nod
e:
+
node: '{nod
e}'
builders:
- xtesting-pi-pull-containers:
<<: *xtesting-pi-containers
builders:
- xtesting-pi-pull-containers:
<<: *xtesting-pi-containers
@@
-171,8
+172,8
@@
- job-template:
name: 'xtesting-pi-{repo}-{container}-{tag}-rmi'
parameters:
- job-template:
name: 'xtesting-pi-{repo}-{container}-{tag}-rmi'
parameters:
- - xtesting-pi-
slav
e:
-
slave: '{slav
e}'
+ - xtesting-pi-
nod
e:
+
node: '{nod
e}'
builders:
- xtesting-pi-remove-images:
<<: *xtesting-pi-containers
builders:
- xtesting-pi-remove-images:
<<: *xtesting-pi-containers
@@
-194,8
+195,8
@@
- job-template:
name: 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
parameters:
- job-template:
name: 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
parameters:
- - xtesting-pi-
slav
e:
-
slave: '{slav
e}'
+ - xtesting-pi-
nod
e:
+
node: '{nod
e}'
- xtesting-pi-build_tag:
build_tag: ''
builders:
- xtesting-pi-build_tag:
build_tag: ''
builders:
@@
-207,6
+208,7
@@
<<: *xtesting-pi-params
volumes:
env:
<<: *xtesting-pi-params
volumes:
env:
+ published_ports:
container: 'xtesting'
test:
- first
container: 'xtesting'
test:
- first
@@
-220,33
+222,14
@@
network: bridge
uid: 1000
gid: 1000
network: bridge
uid: 1000
gid: 1000
- exclude:
- - tag: leguer
- test: eighth
- - tag: kali
- test: eighth
- - tag: jerma
- test: eighth
- - tag: arm-leguer
- test: eighth
- - tag: arm-kali
- test: eighth
- - tag: arm-jerma
- test: eighth
- - tag: arm64-leguer
- test: eighth
- - tag: arm64-kali
- test: eighth
- - tag: arm64-jerma
- test: eighth
jobs:
- 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
- job-template:
name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
parameters:
jobs:
- 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
- job-template:
name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
parameters:
- - xtesting-pi-
slav
e:
-
slave: '{slav
e}'
+ - xtesting-pi-
nod
e:
+
node: '{nod
e}'
- xtesting-pi-build_tag:
build_tag: ''
builders:
- xtesting-pi-build_tag:
build_tag: ''
builders:
@@
-258,6
+241,7
@@
<<: *xtesting-pi-params
volumes:
env:
<<: *xtesting-pi-params
volumes:
env:
+ published_ports:
container: 'xtesting-mts'
test:
- seventh
container: 'xtesting-mts'
test:
- seventh
@@
-283,6
+267,11
@@
for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
do env="-e $i $env"; done
fi
for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
do env="-e $i $env"; done
fi
+ published_ports=;
+ if [ "{published_ports}" != "None" ]; then
+ for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+ do published_ports="-p $i $published_ports"; done
+ fi
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@
-291,13
+280,16
@@
else
image={repo}:{port}/{container}:{tag}
fi
else
image={repo}:{port}/{container}:{tag}
fi
+ sudo mkdir -p $WORKSPACE/results
+ sudo chown {uid}:{gid} $WORKSPACE/results
sudo docker run --rm \
$volumes \
$env \
sudo docker run --rm \
$volumes \
$env \
+ $published_ports \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \
-e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \
-e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
- -v /home/opnfv/xtesting/.boto:/
root/.boto
\
+ -v /home/opnfv/xtesting/.boto:/
etc/boto.cfg
\
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
-e BUILD_TAG=$BUILD_TAG \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
-e BUILD_TAG=$BUILD_TAG \
@@
-307,8
+299,8
@@
- job-template:
name: 'xtesting-pi-{tag}-zip'
parameters:
- job-template:
name: 'xtesting-pi-{tag}-zip'
parameters:
- - xtesting-pi-
slav
e:
-
slave: '{slav
e}'
+ - xtesting-pi-
nod
e:
+
node: '{nod
e}'
- xtesting-pi-build_tag:
build_tag: ''
builders:
- xtesting-pi-build_tag:
build_tag: ''
builders:
@@
-316,13
+308,19
@@
<<: *xtesting-pi-containers
volumes: '{volumes}'
env: '{env}'
<<: *xtesting-pi-containers
volumes: '{volumes}'
env: '{env}'
+ uid: '{uid}'
+ gid: '{gid}'
+ published_ports: '{published_ports}'
- project:
name: 'xtesting-pi-{tag}-zip'
<<: *xtesting-pi-params
volumes:
env:
- project:
name: 'xtesting-pi-{tag}-zip'
<<: *xtesting-pi-params
volumes:
env:
+ published_ports:
container: 'xtesting'
container: 'xtesting'
+ uid: 1000
+ gid: 1000
jobs:
- 'xtesting-pi-{tag}-zip'
jobs:
- 'xtesting-pi-{tag}-zip'
@@
-332,8
+330,8
@@
triggers:
- timed: '@daily'
parameters:
triggers:
- timed: '@daily'
parameters:
- - xtesting-pi-
slav
e:
-
slave: '{slav
e}'
+ - xtesting-pi-
nod
e:
+
node: '{nod
e}'
- xtesting-pi-build_tag:
build_tag: ''
# PyYAML and yamllint differ here
- xtesting-pi-build_tag:
build_tag: ''
# PyYAML and yamllint differ here