Merge "Migrate gerrit-maven-stage (DCAEGEN)-1"

diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index 50952b3..38a06ce 100644 (file)
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -112,6 +112,19 @@
     node: '{build-node}'
     type: freestyle
 
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: '{project}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          submodule-recursive: '{submodule-recursive}'
+          choosing-strategy: 'gerrit'
+
     triggers:
       - timed: '00 */6 * * *'
 

diff --git a/jjb/multicloud/kud-deployment.sh b/jjb/multicloud/kud-deployment.sh
index c720098..937e6c3 100644 (file)
--- a/jjb/multicloud/kud-deployment.sh
+++ b/jjb/multicloud/kud-deployment.sh
@@ -5,4 +5,4 @@ set -x -e -o pipefail
 
 # run all-in-one deployment
 cd ./kud/ci
-sudo bash -x ./ci-kud-installer.sh
+sudo bash -x ./kud-installer.sh

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
index 7dd3c67..2ce9b1c 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -20,7 +20,6 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
           mvn-params: '-P rootOnly'
-      - '{project-name}-{stream}-release-version-profile-java-daily'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 6160957..3391fac 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -18,6 +18,7 @@
       - gerrit-maven-docker-stage:
           build-node: queue-docker-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-P docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-{stream}-release-version-java-daily':