From 333ee43aa9043018f223816c407f573d013186c2 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Wed, 1 Aug 2018 12:06:32 -0700 Subject: [PATCH] Fix nested trigger_jobs (M) After upgrading to JJB 2.2.0 any nested parameters up to 3 levels will be reported as a failure. We need to fix those so that there is only 2 levels maximum. Committing this as a single patch since our verify job is broken. Change-Id: I17cb960bd182c45b8921855f699a0777882fd154 Issue-ID: CIMAN-184 Signed-off-by: Jessica Wagantall --- .../modeling-toscaparsers-javatoscachecker-csit.yaml | 3 +-- jjb/msb/msb-csit.yaml | 12 ++++-------- jjb/multicloud/multicloud-csit.yaml | 3 +-- jjb/multicloud/multicloud-openstack-ocata-csit.yaml | 6 ++---- jjb/multicloud/multicloud-openstack-pike-csit.yaml | 3 +-- jjb/multicloud/multicloud-openstack-vmware-csit.yaml | 3 +-- jjb/multicloud/multicloud-openstack-windriver-csit.yaml | 3 +-- jjb/music/music-csit.yaml | 3 +-- jjb/music/music-distributed-kv-store-csit.yaml | 3 +-- 9 files changed, 13 insertions(+), 26 deletions(-) diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml index 55d66d415..5c9335f29 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'APIs': - trigger_jobs: - - '{project-name}-{stream}-release-version-java-daily' + trigger_jobs: '{project-name}-{stream}-release-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml index 9dada47b6..3b4df5f7b 100644 --- a/jjb/msb/msb-csit.yaml +++ b/jjb/msb/msb-csit.yaml @@ -8,16 +8,12 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'msb-discovery-master-docker-java-version-shell-daily' + trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily' - 'rest-service': - trigger_jobs: - - 'msb-discovery-master-docker-java-version-shell-daily' + trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily' - 'tcp-service': - trigger_jobs: - - 'msb-discovery-master-docker-java-version-shell-daily' + trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily' - 'iag-redirect-discovery': - trigger_jobs: - - 'msb-discovery-master-docker-java-version-shell-daily' + trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml index 770df5417..1687e9c98 100644 --- a/jjb/multicloud/multicloud-csit.yaml +++ b/jjb/multicloud/multicloud-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - '{project-name}-{stream}-multivimbroker-merge-java' + trigger_jobs: '{project-name}-{stream}-multivimbroker-merge-java' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml index e60ab6301..404577d48 100644 --- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml @@ -8,10 +8,8 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' - 'hpa-discovery': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml index 2a1d887a0..f61f66dd8 100644 --- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml index a0ea6a65b..6d1fc12fe 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml index 34ee2017a..fa8dfd454 100644 --- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml @@ -7,7 +7,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml index 7172e7a59..a0dbc8184 100644 --- a/jjb/music/music-csit.yaml +++ b/jjb/music/music-csit.yaml @@ -8,8 +8,7 @@ stream: 'master' functionality: - 'music-test-plan': - trigger_jobs: - - 'music-master-docker-version-java-daily' + trigger_jobs: 'music-master-docker-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml index 14a64ca10..ca94fcdbc 100644 --- a/jjb/music/music-distributed-kv-store-csit.yaml +++ b/jjb/music/music-distributed-kv-store-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'music-distributed-kv-store-test-plan': - trigger_jobs: - - 'music-distributed-kv-store-master-docker-golang-shell-daily' + trigger_jobs: 'music-distributed-kv-store-master-docker-golang-shell-daily' robot-options: '' branch: 'master' -- 2.16.6