Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor tag and functest_tag in Airship jjbs
[releng.git]
/
jjb
/
airship
/
airship.yaml
diff --git
a/jjb/airship/airship.yaml
b/jjb/airship/airship.yaml
index
8d05180
..
7494256
100644
(file)
--- a/
jjb/airship/airship.yaml
+++ b/
jjb/airship/airship.yaml
@@
-8,9
+8,10
@@
repo: 'opnfv'
port:
tag:
repo: 'opnfv'
port:
tag:
- -
hunter
:
- branch:
stable/hun
ter
+ -
latest
:
+ branch:
mas
ter
slave: intel-pod17
slave: intel-pod17
+ functest_tag: hunter
- parameter:
name: airship-slave
- parameter:
name: airship-slave
@@
-24,7
+25,7
@@
repo: '{repo}'
port: '{port}'
container: '{container}'
repo: '{repo}'
port: '{port}'
container: '{container}'
-
tag: '{
tag}'
+
functest_tag: '{functest_
tag}'
- airship-run-containers: &airship-run-containers
name: 'airship-run-containers'
- airship-run-containers: &airship-run-containers
name: 'airship-run-containers'
@@
-37,11
+38,11
@@
- shell: |
set +x
if [ "{repo}" = "_" ]; then
- shell: |
set +x
if [ "{repo}" = "_" ]; then
- image={container}:{tag}
+ image={container}:{
functest_
tag}
elif [ "{port}" = "None" ]; then
elif [ "{port}" = "None" ]; then
- image={repo}/{container}:{tag}
+ image={repo}/{container}:{
functest_
tag}
else
else
- image={repo}:{port}/{container}:{tag}
+ image={repo}:{port}/{container}:{
functest_
tag}
fi
sudo docker pull $image
fi
sudo docker pull $image
@@
-52,11
+53,11
@@
set +ex
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
set +ex
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
- image={container}:{tag}
+ image={container}:{
functest_
tag}
elif [ "{port}" = "None" ]; then
elif [ "{port}" = "None" ]; then
- image={repo}/{container}:{tag}
+ image={repo}/{container}:{
functest_
tag}
else
else
- image={repo}:{port}/{container}:{tag}
+ image={repo}:{port}/{container}:{
functest_
tag}
fi
sudo docker run --rm \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
fi
sudo docker run --rm \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
@@
-84,11
+85,11
@@
- shell: |
set +x
if [ "{repo}" = "_" ]; then
- shell: |
set +x
if [ "{repo}" = "_" ]; then
- image={container}:{tag}
+ image={container}:{
functest_
tag}
elif [ "{port}" = "None" ]; then
elif [ "{port}" = "None" ]; then
- image={repo}/{container}:{tag}
+ image={repo}/{container}:{
functest_
tag}
else
else
- image={repo}:{port}/{container}:{tag}
+ image={repo}:{port}/{container}:{
functest_
tag}
fi
sudo docker rmi $image || true
fi
sudo docker rmi $image || true
@@
-130,10
+131,7
@@
- project:
name: 'airship-deploy'
- project:
name: 'airship-deploy'
- tag:
- - latest:
- branch: master
- slave: intel-pod17
+ <<: *airship-params
jobs:
- 'airship-deploy-{tag}'
jobs:
- 'airship-deploy-{tag}'
@@
-359,7
+357,7
@@
- name: 'airship-opnfv-functest-features-{tag}-pull'
<<: *airship-jobs
- multijob:
- name: 'airship-opnfv-functest-features-{tag}-pull'
<<: *airship-jobs
- multijob:
- name: opnfv/functest-healthcheck:{tag}
+ name: opnfv/functest-healthcheck:{
functest_
tag}
condition: ALWAYS
projects:
- name: 'airship-opnfv-functest-healthcheck-{tag}-connection_check-run'
condition: ALWAYS
projects:
- name: 'airship-opnfv-functest-healthcheck-{tag}-connection_check-run'
@@
-387,7
+385,7
@@
- name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *airship-jobs
- multijob:
- name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *airship-jobs
- multijob:
- name: opnfv/functest-smoke:{tag}
+ name: opnfv/functest-smoke:{
functest_
tag}
condition: ALWAYS
projects:
- name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
condition: ALWAYS
projects:
- name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
@@
-411,7
+409,7
@@
- name: 'airship-opnfv-functest-smoke-{tag}-barbican-run'
<<: *airship-jobs
- multijob:
- name: 'airship-opnfv-functest-smoke-{tag}-barbican-run'
<<: *airship-jobs
- multijob:
- name: opnfv/functest-benchmarking:{tag}
+ name: opnfv/functest-benchmarking:{
functest_
tag}
condition: ALWAYS
projects:
- name: 'airship-opnfv-functest-benchmarking-{tag}-rally_full-run'
condition: ALWAYS
projects:
- name: 'airship-opnfv-functest-benchmarking-{tag}-rally_full-run'
@@
-423,7
+421,7
@@
- name: 'airship-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *airship-jobs
- multijob:
- name: 'airship-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *airship-jobs
- multijob:
- name: opnfv/functest-vnf:{tag}
+ name: opnfv/functest-vnf:{
functest_
tag}
condition: ALWAYS
execution-type: SEQUENTIALLY
projects:
condition: ALWAYS
execution-type: SEQUENTIALLY
projects:
@@
-438,7
+436,7
@@
- name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'
<<: *airship-jobs
- multijob:
- name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'
<<: *airship-jobs
- multijob:
- name: opnfv/functest-features:{tag}
+ name: opnfv/functest-features:{
functest_
tag}
condition: ALWAYS
projects:
- name: 'airship-opnfv-functest-features-{tag}-doctor-notification-run'
condition: ALWAYS
projects:
- name: 'airship-opnfv-functest-features-{tag}-doctor-notification-run'
@@
-452,7
+450,6
@@
- name: 'airship-opnfv-functest-features-{tag}-stor4nfv_os-run'
<<: *airship-jobs
- name: 'airship-opnfv-functest-features-{tag}-stor4nfv_os-run'
<<: *airship-jobs
-
- project:
name: 'airship'
<<: *airship-params
- project:
name: 'airship'
<<: *airship-params