Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Xtesting Jerma jobs
[releng.git]
/
jjb
/
functest
/
xtesting.yaml
diff --git
a/jjb/functest/xtesting.yaml
b/jjb/functest/xtesting.yaml
index
8e2b1e8
..
cc9ec07
100644
(file)
--- a/
jjb/functest/xtesting.yaml
+++ b/
jjb/functest/xtesting.yaml
@@
-10,17
+10,23
@@
tag:
- latest:
branch: master
tag:
- latest:
branch: master
+ slave: lf-virtual1
+ - jerma:
+ branch: stable/jerma
+ slave: lf-virtual1
+ - iruya:
+ branch: stable/iruya
+ slave: lf-virtual1
- hunter:
branch: stable/hunter
- hunter:
branch: stable/hunter
- - gambia:
- branch: stable/gambia
+ slave: lf-virtual1
- parameter:
name: xtesting-slave
parameters:
- label:
name: slave
- parameter:
name: xtesting-slave
parameters:
- label:
name: slave
- default:
lf-build2
+ default:
'{slave}'
- parameter:
name: xtesting-branch
- parameter:
name: xtesting-branch
@@
-73,8
+79,13
@@
else
image={repo}:{port}/{container}:{tag}
fi
else
image={repo}:{port}/{container}:{tag}
fi
+ if [ "{ref_arg}" = "None" ]; then
+ build_arg=""
+ else
+ build_arg="--build-arg {ref_arg}={ref}"
+ fi
cd {path}
cd {path}
- sudo docker build
--build-arg {ref_arg}={ref}
\
+ sudo docker build
$build_arg
\
--pull=false --no-cache --force-rm=true \
-t $image .
--pull=false --no-cache --force-rm=true \
-t $image .
@@
-93,6
+104,7
@@
fi
sudo docker run --rm \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
fi
sudo docker run --rm \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+ -e DEBUG=true \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
@@
-126,45
+138,48
@@
- '{ref}'
- job-template:
- '{ref}'
- job-template:
- name: '{repo}-{container}-{tag}-pull'
+ name: '
xtesting-
{repo}-{container}-{tag}-pull'
parameters:
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
builders:
- xtesting-pull-containers:
<<: *xtesting-containers
- project:
builders:
- xtesting-pull-containers:
<<: *xtesting-containers
- project:
- name: 'opnfv-xtesting-pull'
+ name: '
xtesting-
opnfv-xtesting-pull'
<<: *xtesting-params
container: 'xtesting'
jobs:
<<: *xtesting-params
container: 'xtesting'
jobs:
- - '{repo}-{container}-{tag}-pull'
+ - '
xtesting-
{repo}-{container}-{tag}-pull'
- job-template:
- job-template:
- name: '{repo}-{container}-{tag}-rmi'
+ name: '
xtesting-
{repo}-{container}-{tag}-rmi'
parameters:
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
builders:
- xtesting-remove-images:
<<: *xtesting-containers
- project:
builders:
- xtesting-remove-images:
<<: *xtesting-containers
- project:
- name: 'opnfv-xtesting-rmi'
+ name: '
xtesting-
opnfv-xtesting-rmi'
<<: *xtesting-params
container: 'xtesting'
jobs:
<<: *xtesting-params
container: 'xtesting'
jobs:
- - '{repo}-{container}-{tag}-rmi'
+ - '
xtesting-
{repo}-{container}-{tag}-rmi'
- job-template:
- job-template:
- name: '{repo}-{container}-{tag}-{test}-run'
+ name: '
xtesting-
{repo}-{container}-{tag}-{test}-run'
parameters:
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
builders:
- xtesting-run-containers:
<<: *xtesting-run-containers
- project:
builders:
- xtesting-run-containers:
<<: *xtesting-run-containers
- project:
- name: 'opnfv-xtesting'
+ name: '
xtesting-
opnfv-xtesting'
<<: *xtesting-params
container: 'xtesting'
test:
<<: *xtesting-params
container: 'xtesting'
test:
@@
-173,8
+188,14
@@
- third
- fourth
- fifth
- third
- fourth
- fifth
+ - sixth
+ exclude:
+ - tag: hunter
+ test: sixth
+ - tag: iruya
+ test: sixth
jobs:
jobs:
- - '{repo}-{container}-{tag}-{test}-run'
+ - '
xtesting-
{repo}-{container}-{tag}-{test}-run'
- job-template:
name: 'xtesting-{tag}-daily'
- job-template:
name: 'xtesting-{tag}-daily'
@@
-182,42
+203,46
@@
triggers:
- timed: '@daily'
parameters:
triggers:
- timed: '@daily'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^xtesting-
.*
-(daily|check|gate)$'
+ - '^xtesting-
{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
projects:
builders:
- multijob:
name: remove former images
projects:
- - name: 'opnfv-xtesting-{tag}-rmi'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-rmi'
<<: *xtesting-jobs
- multijob:
name: pull containers
projects:
<<: *xtesting-jobs
- multijob:
name: pull containers
projects:
- - name: 'opnfv-xtesting-{tag}-pull'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-pull'
<<: *xtesting-jobs
- multijob:
name: opnfv/xtesting:{tag}
projects:
<<: *xtesting-jobs
- multijob:
name: opnfv/xtesting:{tag}
projects:
- - name: 'opnfv-xtesting-{tag}-first-run'
+ - name: 'xtesting-opnfv-xtesting-{tag}-first-run'
+ <<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-{tag}-second-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: '
opnfv-xtesting-{tag}-secon
d-run'
+ - name: '
xtesting-opnfv-xtesting-{tag}-thir
d-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: '
opnfv-xtesting-{tag}-third
-run'
+ - name: '
xtesting-opnfv-xtesting-{tag}-fourth
-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: '
opnfv-xtesting-{tag}-four
th-run'
+ - name: '
xtesting-opnfv-xtesting-{tag}-fif
th-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: '
opnfv-xtesting-{tag}-fif
th-run'
+ - name: '
xtesting-opnfv-xtesting-{tag}-six
th-run'
<<: *xtesting-jobs
- job-template:
<<: *xtesting-jobs
- job-template:
- name: '{repo}-{container}-{tag}-gate'
+ name: '
xtesting-
{repo}-{container}-{tag}-gate'
parameters:
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
scm:
- xtesting-scm:
ref: $GERRIT_REFSPEC
scm:
- xtesting-scm:
ref: $GERRIT_REFSPEC
@@
-227,9
+252,10
@@
ref: $GERRIT_REFSPEC
- job-template:
ref: $GERRIT_REFSPEC
- job-template:
- name: '{repo}-{container}-{tag}-check'
+ name: '
xtesting-
{repo}-{container}-{tag}-check'
parameters:
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
- xtesting-branch:
branch: '{branch}'
scm:
- xtesting-branch:
branch: '{branch}'
scm:
@@
-241,38
+267,41
@@
ref: $branch
- project:
ref: $branch
- project:
- name: '
_-alpine-3.8
-rmi'
+ name: '
xtesting-_-alpine-3.10
-rmi'
repo: _
port:
container: alpine
repo: _
port:
container: alpine
- tag: 3.8
+ tag: '3.10'
+ slave: master
jobs:
jobs:
- - '{repo}-{container}-{tag}-rmi'
+ - '
xtesting-
{repo}-{container}-{tag}-rmi'
- project:
- project:
- name: '
_-alpine-3.8
-pull'
+ name: '
xtesting-_-alpine-3.10
-pull'
repo: _
port:
container: alpine
repo: _
port:
container: alpine
- tag: 3.8
+ tag: '3.10'
+ slave: master
jobs:
jobs:
- - '{repo}-{container}-{tag}-pull'
+ - '
xtesting-
{repo}-{container}-{tag}-pull'
- project:
- project:
- name: opnfv-xtesting-{tag}-build
+ name:
xtesting-
opnfv-xtesting-{tag}-build
<<: *xtesting-params
container: xtesting
ref_arg: BRANCH
path: docker
jobs:
<<: *xtesting-params
container: xtesting
ref_arg: BRANCH
path: docker
jobs:
- - '{repo}-{container}-{tag}-gate'
- - '{repo}-{container}-{tag}-check'
+ - '
xtesting-
{repo}-{container}-{tag}-gate'
+ - '
xtesting-
{repo}-{container}-{tag}-check'
- job-template:
name: 'xtesting-{tag}-check'
project-type: multijob
parameters:
- job-template:
name: 'xtesting-{tag}-check'
project-type: multijob
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
- xtesting-branch:
branch: '{branch}'
properties:
- xtesting-branch:
branch: '{branch}'
properties:
@@
-280,40
+309,42
@@
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^xtesting-
.*
-(daily|check|gate)$'
+ - '^xtesting-
{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
projects:
builders:
- multijob:
name: remove former images
projects:
- - name: 'opnfv-xtesting-{tag}-rmi'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-rmi'
<<: *xtesting-jobs
- multijob:
name: remove dependencies
projects:
<<: *xtesting-jobs
- multijob:
name: remove dependencies
projects:
- - name: '
_-alpine-3.8
-rmi'
+ - name: '
xtesting-_-alpine-3.10
-rmi'
<<: *xtesting-jobs
- multijob:
name: pull dependencies
projects:
<<: *xtesting-jobs
- multijob:
name: pull dependencies
projects:
- - name: '
_-alpine-3.8
-pull'
+ - name: '
xtesting-_-alpine-3.10
-pull'
<<: *xtesting-jobs
- multijob:
<<: *xtesting-jobs
- multijob:
- name: opnfv/
functest-
xtesting
+ name: opnfv/xtesting
projects:
projects:
- - name: 'opnfv-xtesting-{tag}-check'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-check'
<<: *xtesting-jobs
- multijob:
name: opnfv/xtesting:{tag}
projects:
<<: *xtesting-jobs
- multijob:
name: opnfv/xtesting:{tag}
projects:
- - name: 'opnfv-xtesting-{tag}-first-run'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-first-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: 'opnfv-xtesting-{tag}-second-run'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-second-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: 'opnfv-xtesting-{tag}-third-run'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-third-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: 'opnfv-xtesting-{tag}-fourth-run'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-fourth-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: 'opnfv-xtesting-{tag}-fifth-run'
+ - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
+ <<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
<<: *xtesting-jobs
- trigger:
<<: *xtesting-jobs
- trigger:
@@
-346,46
+377,49
@@
- xtesting-patchset-created:
branch: '{branch}'
parameters:
- xtesting-patchset-created:
branch: '{branch}'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^xtesting-
.*
-(daily|check|gate)$'
+ - '^xtesting-
{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
projects:
builders:
- multijob:
name: remove former images
projects:
- - name: 'opnfv-xtesting-{tag}-rmi'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-rmi'
<<: *xtesting-jobs
- multijob:
name: remove dependencies
projects:
<<: *xtesting-jobs
- multijob:
name: remove dependencies
projects:
- - name: '
_-alpine-3.8
-rmi'
+ - name: '
xtesting-_-alpine-3.10
-rmi'
<<: *xtesting-jobs
- multijob:
name: pull dependencies
projects:
<<: *xtesting-jobs
- multijob:
name: pull dependencies
projects:
- - name: '
_-alpine-3.8
-pull'
+ - name: '
xtesting-_-alpine-3.10
-pull'
<<: *xtesting-jobs
- multijob:
<<: *xtesting-jobs
- multijob:
- name: opnfv/
functest-
xtesting
+ name: opnfv/xtesting
projects:
projects:
- - name: 'opnfv-xtesting-{tag}-gate'
+ - name: '
xtesting-
opnfv-xtesting-{tag}-gate'
<<: *xtesting-jobs
- multijob:
name: opnfv/xtesting:{tag}
projects:
<<: *xtesting-jobs
- multijob:
name: opnfv/xtesting:{tag}
projects:
- - name: 'opnfv-xtesting-{tag}-first-run'
+ - name: 'xtesting-opnfv-xtesting-{tag}-first-run'
+ <<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-{tag}-second-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: '
opnfv-xtesting-{tag}-secon
d-run'
+ - name: '
xtesting-opnfv-xtesting-{tag}-thir
d-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: '
opnfv-xtesting-{tag}-third
-run'
+ - name: '
xtesting-opnfv-xtesting-{tag}-fourth
-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: '
opnfv-xtesting-{tag}-four
th-run'
+ - name: '
xtesting-opnfv-xtesting-{tag}-fif
th-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- - name: '
opnfv-xtesting-{tag}-fif
th-run'
+ - name: '
xtesting-opnfv-xtesting-{tag}-six
th-run'
<<: *xtesting-jobs
- project:
<<: *xtesting-jobs
- project:
@@
-406,4
+440,4
@@
- last-success
- last-failure
- last-duration
- last-success
- last-failure
- last-duration
- regex: ^xtesting-
.*
-(daily|check|gate)$
+ regex: ^xtesting-
[a-z]+
-(daily|check|gate)$