Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Clean functest-kubernetes jjb
[releng.git]
/
jjb
/
functest
/
functest-kubernetes.yaml
diff --git
a/jjb/functest/functest-kubernetes.yaml
b/jjb/functest/functest-kubernetes.yaml
index
1c2ed83
..
5bfa717
100644
(file)
--- a/
jjb/functest/functest-kubernetes.yaml
+++ b/
jjb/functest/functest-kubernetes.yaml
@@
-8,15
+8,22
@@
repo: 'opnfv'
port:
tag:
repo: 'opnfv'
port:
tag:
+ - latest:
+ branch: master
+ slave: lf-virtual8
+ - iruya:
+ branch: stable/iruya
+ slave: lf-virtual7
- hunter:
branch: stable/hunter
- hunter:
branch: stable/hunter
+ slave: lf-virtual5
- parameter:
name: functest-kubernetes-slave
parameters:
- label:
name: slave
- parameter:
name: functest-kubernetes-slave
parameters:
- label:
name: slave
- default:
functest-virtual
+ default:
'{slave}'
- parameter:
name: functest-kubernetes-branch
- parameter:
name: functest-kubernetes-branch
@@
-55,7
+62,7
@@
else
image={repo}:{port}/{container}:{tag}
fi
else
image={repo}:{port}/{container}:{tag}
fi
-
sudo
docker pull $image
+ docker pull $image
- builder:
name: functest-kubernetes-build-containers
- builder:
name: functest-kubernetes-build-containers
@@
-75,7
+82,7
@@
build_arg="--build-arg {ref_arg}={ref}"
fi
cd {path}
build_arg="--build-arg {ref_arg}={ref}"
fi
cd {path}
-
sudo
docker build $build_arg \
+ docker build $build_arg \
--pull=false --no-cache --force-rm=true \
-t $image .
--pull=false --no-cache --force-rm=true \
-t $image .
@@
-84,7
+91,7
@@
builders:
- shell: |
set +ex
builders:
- shell: |
set +ex
- [ ! -z "$WORKSPACE" ] &&
sudo
rm -rf $WORKSPACE/* || true
+ [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@
-92,10
+99,10
@@
else
image={repo}:{port}/{container}:{tag}
fi
else
image={repo}:{port}/{container}:{tag}
fi
-
sudo
docker run --rm \
+ docker run --rm \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
- -v /home/opnfv/functest-kubernetes/config:/root/.kube/config \
+ -v /home/opnfv/functest-kubernetes/config
.{tag}
:/root/.kube/config \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
@@
-117,7
+124,7
@@
else
image={repo}:{port}/{container}:{tag}
fi
else
image={repo}:{port}/{container}:{tag}
fi
-
sudo
docker rmi $image || true
+ docker rmi $image || true
- scm:
name: functest-kubernetes-scm
- scm:
name: functest-kubernetes-scm
@@
-131,7
+138,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
builders:
- functest-kubernetes-pull-containers:
<<: *functest-kubernetes-containers
builders:
- functest-kubernetes-pull-containers:
<<: *functest-kubernetes-containers
@@
-160,7
+168,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
builders:
- functest-kubernetes-remove-images:
<<: *functest-kubernetes-containers
builders:
- functest-kubernetes-remove-images:
<<: *functest-kubernetes-containers
@@
-189,7
+198,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
builders:
- functest-kubernetes-run-containers:
<<: *functest-kubernetes-run-containers
builders:
- functest-kubernetes-run-containers:
<<: *functest-kubernetes-run-containers
@@
-228,13
+238,14
@@
triggers:
- timed: '@daily'
parameters:
triggers:
- timed: '@daily'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-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:
- - '^
(functest|functest-kubernetes)-[a-z]+
-(daily|check|gate)$'
+ - '^
functest-kubernetes-{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images
@@
-275,7
+286,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
scm:
- functest-kubernetes-scm:
ref: $GERRIT_REFSPEC
scm:
- functest-kubernetes-scm:
ref: $GERRIT_REFSPEC
@@
-287,7
+299,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-check'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-check'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
- functest-kubernetes-branch:
branch: '{branch}'
scm:
- functest-kubernetes-branch:
branch: '{branch}'
scm:
@@
-304,6
+317,7
@@
port:
container: golang
tag: alpine3.9
port:
container: golang
tag: alpine3.9
+ slave: master
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
@@
-313,6
+327,7
@@
port:
container: golang
tag: alpine3.9
port:
container: golang
tag: alpine3.9
+ slave: master
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-pull'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@
-360,7
+375,8
@@
name: 'functest-kubernetes-{tag}-check'
project-type: multijob
parameters:
name: 'functest-kubernetes-{tag}-check'
project-type: multijob
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
- functest-kubernetes-branch:
branch: '{branch}'
properties:
- functest-kubernetes-branch:
branch: '{branch}'
properties:
@@
-368,7
+384,7
@@
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^
(functest|functest-kubernetes)-[a-z]+
-(daily|check|gate)$'
+ - '^
functest-kubernetes-{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images
@@
-454,13
+470,14
@@
- functest-kubernetes-patchset-created:
branch: '{branch}'
parameters:
- functest-kubernetes-patchset-created:
branch: '{branch}'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-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:
- - '^
(functest|functest-kubernetes)-[a-z]+
-(daily|check|gate)$'
+ - '^
functest-kubernetes-{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images