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 "Basic Getting Started guide for OPNFV CI"
[releng.git]
/
jjb
/
functest
/
functest-pi.yaml
diff --git
a/jjb/functest/functest-pi.yaml
b/jjb/functest/functest-pi.yaml
index
09fef45
..
78635d7
100644
(file)
--- a/
jjb/functest/functest-pi.yaml
+++ b/
jjb/functest/functest-pi.yaml
@@
-1,7
+1,10
@@
---
---
-- functest-pi-jobs: &functest-pi-jobs
- name: 'functest-pi-jobs'
- current-parameters: true
+- functest-pi-containers: &functest-pi-containers
+ name: 'functest-pi-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ tag: '{tag}'
- functest-pi-params: &functest-pi-params
name: 'functest-pi-params'
- functest-pi-params: &functest-pi-params
name: 'functest-pi-params'
@@
-63,6
+66,10
@@
slave: lf-virtual6
DASHBOARD_URL: http://172.30.13.91
slave: lf-virtual6
DASHBOARD_URL: http://172.30.13.91
+- functest-pi-jobs: &functest-pi-jobs
+ name: 'functest-pi-jobs'
+ current-parameters: true
+
- parameter:
name: functest-pi-slave
parameters:
- parameter:
name: functest-pi-slave
parameters:
@@
-95,13
+102,6
@@
name: IMAGE_PROPERTIES
default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
name: IMAGE_PROPERTIES
default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-- functest-pi-containers: &functest-pi-containers
- name: 'functest-pi-containers'
- repo: '{repo}'
- port: '{port}'
- container: '{container}'
- tag: '{tag}'
-
- functest-pi-run-containers: &functest-pi-run-containers
name: 'functest-pi-run-containers'
<<: *functest-pi-containers
- functest-pi-run-containers: &functest-pi-run-containers
name: 'functest-pi-run-containers'
<<: *functest-pi-containers
@@
-171,7
+171,6
@@
fi
sudo docker rmi $image || true
fi
sudo docker rmi $image || true
-
- job-template:
name: 'functest-pi-{repo}-{container}-{tag}-pull'
parameters:
- job-template:
name: 'functest-pi-{repo}-{container}-{tag}-pull'
parameters:
@@
-517,6
+516,7
@@
builders:
- shell: |
set +x
builders:
- shell: |
set +x
+ [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@
-765,4
+765,4
@@
- last-success
- last-failure
- last-duration
- last-success
- last-failure
- last-duration
- regex: ^functest-pi-[a-z-0-9]+-daily$
+ regex: ^functest-pi-[a-z-0-9
.
]+-daily$