Fix dublin merge release jobs

My original change over was incorrect as I used casablanca
jobs for dublin. The dublin jobs use different underlying
jobs.

Issue-ID: POLICY-1857
Change-Id: I3c714bcc1a2d44d04b479c85941b1785f8047f80
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index a22d850..ad71fa2 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -28,9 +28,19 @@
     project-name: 'policy-drools-applications-dublin'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
+      - '{project-name}-{stream}-merge-scm-mvn-script':
+          mvn-goals: 'clean deploy -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+          script:
+            !include-raw-escape: 'drools-apps-docker-merge.sh'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'clean deploy -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+          script:
+            !include-raw-escape: 'drools-apps-docker-release.sh'
+          disabled: true
+          build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/drools-applications'
     stream: