Fix nested trigger_jobs (O-S)
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.
Change-Id: Icb86bc28bb66727737568386f0258d5d570c1fc7
Issue-ID: CIMAN-184
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index 459c498..f0d2156 100644
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -12,7 +12,6 @@
branch: beijing
functionality:
- 'has':
- trigger_jobs:
- - 'optf-has-master-conductor-docker-java-version-shell-daily'
+ trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index cff6616..e3ab1d5 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,18 +1,30 @@
- project:
- name: policy-csit
+ name: policy-health-csit
jobs:
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
stream: 'master'
functionality:
- - 'health':
- trigger_jobs:
- - 'policy-engine-{stream}-merge-scm-mvn-script'
- - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
- - 'policy-drools-applications-{stream}-merge-java'
- - 'apex-pdp':
- trigger_jobs:
- - 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
+ - 'health'
+ trigger_jobs:
+ - 'policy-engine-{stream}-merge-scm-mvn-script'
+ - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
+ - 'policy-drools-applications-{stream}-merge-java'
robot-options: ''
branch: 'master'
+
+- project:
+ name: policy-apex-pdp-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'policy'
+ stream: 'master'
+ functionality:
+ - 'apex-pdp'
+ trigger_jobs:
+ - 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
+ robot-options: ''
+ branch: 'master'
+
diff --git a/jjb/portal-sdk/portal-sdk-csit.yaml b/jjb/portal-sdk/portal-sdk-csit.yaml
index 111484a..c5667e6 100644
--- a/jjb/portal-sdk/portal-sdk-csit.yaml
+++ b/jjb/portal-sdk/portal-sdk-csit.yaml
@@ -7,7 +7,6 @@
stream: 'master'
functionality:
- 'testsuite':
- trigger_jobs:
- - 'portal-docker-{stream}-merge-docker-script'
+ trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
robot-options: ''
- branch: 'master'
\ No newline at end of file
+ branch: 'master'
diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml
index a8e9612..697db46 100644
--- a/jjb/portal/portal-csit.yaml
+++ b/jjb/portal/portal-csit.yaml
@@ -7,7 +7,6 @@
stream: 'master'
functionality:
- 'testsuite':
- trigger_jobs:
- - 'portal-docker-{stream}-merge-docker-script'
+ trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
robot-options: ''
branch: 'master'
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index db3db4c..c5d7261 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -10,14 +10,11 @@
branch: 'master'
functionality:
- 'sanity':
- trigger_jobs:
- - '{project-name}-{stream}-sdc-merge-java'
+ trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
- 'nightly':
- trigger_jobs:
- - '{project-name}-{stream}-docker-version-java-daily'
+ trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
- 'uiSanity':
- trigger_jobs:
- - '{project-name}-{stream}-docker-version-java-daily'
+ trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
robot-options: ''
branch: 'master'
html-dir: 'archives'
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 1cd1eb9..12d6975 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -8,7 +8,6 @@
stream: 'master'
functionality:
- 'healthcheck':
- trigger_jobs:
- - '{project-name}-{stream}-release-java-daily-checkstyle'
+ trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
robot-options: ''
branch: 'master'
diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index 947cde5..288e6f4 100644
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -8,7 +8,6 @@
stream: 'master'
functionality:
- 'integration-testing':
- trigger_jobs:
- - 'so-master-docker-version-java-daily'
+ trigger_jobs: 'so-master-docker-version-java-daily'
robot-options: ''
branch: 'master'