Fix cascade build references for docker.

The parent jobs that trigger the docker build may reside in
different jenkins job structure. Adding a parameter to configure
the parent job that should trigger the build.

Change-Id: I796976c97abc77feea1c9625c11023802ef2f54d
Issue-ID: VFC-728
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>

diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 7b5df82..cf1d56e 100644 (file)
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -166,7 +166,7 @@
     triggers:
       - reverse:
           jobs:
-            - '{project-name}-{stream}-{subproject}-merge-java'
+            - '{parent_job}'
           result: 'success'
 
 - job-template:
@@ -251,7 +251,7 @@
     triggers:
       - reverse:
           jobs:
-            - '{project-name}-{stream}-{subproject}-verify-java'
+            - '{parent_job}'
           result: 'success'
 
 - job-template:
@@ -364,7 +364,7 @@
     triggers:
       - reverse:
           jobs:
-            - '{project-name}-{stream}-release-version-java-daily'
+            - '{parent_job}'
           result: 'success'
 
 - job-template:
@@ -442,7 +442,7 @@
     triggers:
       - reverse:
           jobs:
-            - '{project-name}-{stream}-{subproject}-merge-java'
+            - '{parent_job}'
           result: 'success'
 
 - job-template:
@@ -523,7 +523,7 @@
     triggers:
       - reverse:
           jobs:
-            - '{project-name}-{stream}-{subproject}-verify-java'
+            - '{parent_job}'
           result: 'success'
 
 - job-template:
@@ -636,7 +636,7 @@
     triggers:
       - reverse:
           jobs:
-            - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+            - '{parent_job}'
           result: 'success'
 
 - job-template:
@@ -740,7 +740,7 @@
     triggers:
       - reverse:
           jobs:
-            - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+            - '{parent_job}'
           result: 'success'
 
 

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index f873300..cb55774 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -39,11 +39,13 @@
           docker_build_args: '--build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots'
           docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
           docker_root: '$WORKSPACE/nokiav2/deployment'
+          parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-merge-java'
       - '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger':
           docker_build_args: '--build-arg MODE= --build-arg REPO=staging'
           docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
           docker_root: '$WORKSPACE/nokiav2/deployment'
           docker_registry: '$DOCKER_REGISTRY:10003'
+          parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-release-version-java-daily'
 #Since the release is moved manually from the staging repo to the release repo this job can not
 #be triggered in a cascade way
       - '{project-name}-{subproject}-{stream}-release-version-docker-no-sonar':