X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmulticloud%2Fmulticloud-openstack.yaml;h=da9605fe6f751dad4b0e323160923d169e3905ab;hb=5e5f77398c9e2fb48842f795d745a045f58ff665;hp=c9151f79334454d878eeccbbd14e003af50e3c53;hpb=bfe66b08fdac7b2d3726a54e419f0009ad43a63a;p=ci-management.git

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index c9151f793..da9605fe6 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -12,16 +12,10 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'multicloud-openstack-settings'
     subproject:
-      - 'ocata':
-          path: 'ocata'
-          pattern: 'ocata/**'
-          pom: 'ocata/pom.xml'
-      - 'ocata_share':
-          path: 'ocata'
-          pattern: 'share/**'
-          pom: 'ocata/pom.xml'
       - 'pike':
           path: 'pike'
           pattern: 'pike/**'
@@ -50,25 +44,31 @@
           path: 'fcaps'
           pattern: 'fcaps/**'
           pom: 'fcaps/pom.xml'
-      - 'lenovo':
-          path: 'lenovo'
-          pattern: 'lenovo/**'
-          pom: 'lenovo/pom.xml'
-      - 'lenovo_share':
-          path: 'lenovo'
-          pattern: 'share/**'
-          pom: 'lenovo/pom.xml'
+#      - 'lenovo':
+#          path: 'lenovo'
+#          pattern: 'lenovo/**'
+#          pom: 'lenovo/pom.xml'
+#      - 'lenovo_share':
+#          path: 'lenovo'
+#          pattern: 'share/**'
+#          pom: 'lenovo/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
@@ -91,19 +91,6 @@
 #    files: '**'
 #    archive-artifacts: ''
 #
-- project:
-    name: multicloud-openstack-ocata-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-ocata'
-    branch: 'master'
-    mvn-params: '-f ocata/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     name: multicloud-openstack-windriver-sonar
@@ -172,19 +159,19 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- project:
-    name: multicloud-openstack-lenovo-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-lenovo'
-    branch: 'master'
-    mvn-params: '-f lenovo/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+#- project:
+#    name: multicloud-openstack-lenovo-sonar
+#    jobs:
+#      - gerrit-maven-sonar
+#    cron: '@daily'
+#    build-node: ubuntu1604-builder-4c-4g
+#    project: 'multicloud/openstack'
+#    project-name: 'multicloud-openstack-lenovo'
+#    branch: 'master'
+#    mvn-params: '-f lenovo/pom.xml'
+#    mvn-settings: 'multicloud-openstack-settings'
+#    mvn-goals: 'clean install'
+#    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     name: multicloud-openstack-info