X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmulticloud%2Fmulticloud-openstack.yaml;h=f78ca6d7e85e8d62c5dbe8413869afee3d34e57c;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=9947419b9ce575a6520628aeb26b1f79190920d0;hpb=63306166fa492a8e37429b9cf12773cb5184ae17;p=ci-management.git

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 9947419b9..f78ca6d7e 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,14 +44,18 @@
           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'
+      - 'hpa':
+          path: 'hpa'
+          pattern: 'hpa/**'
+          pom: 'hpa/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -66,16 +64,18 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{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'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: centos7-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'
+    build-node: 'centos7-builder-4c-4g'
 
 #- project:
 #    name: multicloud-openstack-arm64
@@ -91,30 +91,22 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    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
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-windriver'
     branch: 'master'
@@ -127,8 +119,13 @@
     name: multicloud-openstack-pike-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-pike'
     branch: 'master'
@@ -141,8 +138,13 @@
     name: multicloud-openstack-starlingx-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-starlingx'
     branch: 'master'
@@ -158,16 +160,25 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack
     project-name: 'multicloud-openstack'
-    build-node: ubuntu1604-memcached-4c-4g
-    branch: 'master'
+    build-node: ubuntu2004-memcached-4c-4g
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'multicloud-openstack-settings'
 
 - project:
     name: multicloud-openstack-fcaps-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-fcaps'
     branch: 'master'
@@ -176,16 +187,40 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+#- project:
+#    name: multicloud-openstack-lenovo-sonar
+#    jobs:
+#      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+#    cron: '@daily'
+#    build-node: ubuntu1804-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
+    name: multicloud-openstack-hpa-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-lenovo'
+    project-name: 'multicloud-openstack-hpa'
     branch: 'master'
-    mvn-params: '-f lenovo/pom.xml'
+    mvn-params: '-f hpa/pom.xml'
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -195,5 +230,6 @@
     project-name: multicloud-openstack
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/openstack
     branch: master