Merge "Fix dcae build errors"

diff --git a/global-jjb b/global-jjb
index 729b2e3..33d8d18 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 729b2e3535f009a146719df7d7b52e036b2505cb
+Subproject commit 33d8d18e8981751af8602f497e53512478ee2696

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index ea6767c..4fb913d 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -11,6 +11,8 @@ LOGS_SERVER=https://logs.onap.org
 NEXUS_URL=https://nexus.onap.org
 NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
+RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
+RELEASE_USERNAME=onap-release
 SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-release-2018
 SILO=production

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 9fad0a1..0e5d1c5 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -11,6 +11,8 @@ LOGS_SERVER=https://logs.onap.org
 NEXUS_URL=https://nexus.onap.org
 NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
+RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
+RELEASE_USERNAME=onap-release
 SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-test
 SILO=sandbox

diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index d1d0f54..0f5da07 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -9,6 +9,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'dmaap/messagerouter/mirroragent'
     stream:

diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 8dd517c..3ef84fa 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -9,6 +9,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'dmaap/messagerouter/msgrtr'
     stream:

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index b86e653..a985a43 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -50,4 +50,5 @@
     submodule-disable: false
 
     # Jenkins
-    jenkins-ssh-credential: onap-jenkins-ssh
+    jenkins-ssh-credential: 'onap-jenkins-ssh'
+    jenkins-ssh-release-credential: 'jenkins-release'