diff options
author | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-09-24 17:27:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-09-24 17:27:13 +0000 |
commit | bca7c937d1f5e51f0e1d620b153ffa80dd69b25f (patch) | |
tree | 7998ab00fc349ce16d1c3ab82178da5f99a4687b | |
parent | 4aba4e45d2a3017f33a9b189eaff3c56005f19ac (diff) | |
parent | 3c42e088e4dba2b3de547023269fe550d4b3a620 (diff) |
Merge "Fix nested trigger_jobs (U-V)"
-rw-r--r-- | jjb/usecaseui/usecase-ui-server-csit.yaml | 3 | ||||
-rw-r--r-- | jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-gvnfm-vnfres-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-catalog-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-ems-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-lcm-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-resmanagement-csit.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-wfengine-csit.yaml | 10 | ||||
-rw-r--r-- | jjb/vid/vid-csit.yaml | 3 | ||||
-rw-r--r-- | jjb/vnfsdk/vnfsdk-refrepo-csit.yaml | 3 |
15 files changed, 30 insertions, 44 deletions
diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/usecaseui/usecase-ui-server-csit.yaml index 96869fd15..b348d065f 100644 --- a/jjb/usecaseui/usecase-ui-server-csit.yaml +++ b/jjb/usecaseui/usecase-ui-server-csit.yaml @@ -7,7 +7,6 @@ stream: 'master' functionality: - 'testsuite': - trigger_jobs: - - '{project-name}-{stream}-docker-java-daily' + trigger_jobs: '{project-name}-{stream}-docker-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml index 7280f735e..9915a4408 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml index f8436a65a..cc68c4ac0 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml index afb3ccd3d..008ef3c30 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml index 8a4269cb7..9affcfc05 100644 --- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml +++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-catalog-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml index 312528866..f022d9707 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml index f433b0639..842d67175 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml index 3edde732b..8107792fc 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml index d97117683..734273893 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml index f5ad31137..d5480c23a 100644 --- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-lcm-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-lcm-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml index 580443fd2..4f091ac0d 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml index 354bd3724..3f62a53e3 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml index b23a90d7b..a9fcfdbf5 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml @@ -7,9 +7,9 @@ project-name: 'vfc-nfvo-wfengine' stream: 'master' functionality: - - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily' - - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily' + - 'sanity-check' + trigger_jobs: + - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily' + - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index b1124ab70..2b3562fd1 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'healthCheck': - trigger_jobs: - - '{project-name}-{stream}-docker-version-java-daily' + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml index 56634b547..e34fd7403 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - '{project-name}-{stream}-merge-java' + trigger_jobs: '{project-name}-{stream}-merge-java' robot-options: '' branch: 'master' |