Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / msb / msb-apigateway.yaml

diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index a86a178..b2d8bed 100644 (file)
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -11,47 +11,60 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-apigateway-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: 'distributions/msb-apigateway/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'msb/apigateway'
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'msb-apigateway-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: msb-apigateway-arm64
-    project-name: 'msb-apigateway-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-apigateway-docker-image.sh'
-
-    project: 'msb/apigateway'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-apigateway-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
 
+#- project:
+#    name: msb-apigateway-arm64
+#    project-name: 'msb-apigateway-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-apigateway-docker-image.sh'
+#
+#    project: 'msb/apigateway'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'msb-apigateway-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1804-docker-arm64-4c-2g
+#
 - project:
     name: msb-apigateway-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: 'msb/apigateway'
     project-name: 'msb-apigateway'
     branch: 'master'
@@ -68,3 +81,12 @@
     project-name: 'msb-apigateway'
     branch: 'master'
     mvn-settings: 'msb-apigateway-settings'
+
+- project:
+    name: msb-apigateway-info
+    project-name: msb-apigateway
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: msb/apigateway
+    branch: master