X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdnc%2Fsdnc-oam.yaml;h=563f4746918ad457a53919976b701201a0ad42fb;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=8efe0f7fd6e6be5c15b9691297a54539b32a2132;hpb=8cab4cdae78fc12ce61ea8b6c9dd0f61a5127efa;p=ci-management.git

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 8efe0f7fd..34666de1e 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -1,49 +1,88 @@
 ---
-
 - project:
     name: sdnc-oam
     project-name: 'sdnc-oam'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-verify:
+          cron: ''
+      - gerrit-maven-merge:
+          cron: '@daily'
+          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
+          sign-artifacts: true
+          mvn-params: '-Dmaven.test.skip=true'
+          cron: ''
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker'
+          maven-versions-plugin: true
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'sdnc/oam'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
+    mvn-version: "mvn38"
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
+    shallow-clone: true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+
+#
+#- project:
+#    name: sdnc-oam-docker-arm64
+#    project-name: 'sdnc-oam-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'sdnc/oam'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdnc-oam-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
-    name: sdnc-oam-docker
-    project-name: 'sdnc-oam'
+    name: sdnc-oam-clm
     jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdnc/oam'
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: sdnc/oam
+    project-name: 'sdnc-oam'
+    build-node: ubuntu2004-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdnc-oam-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: queue-docker-4c-4g
+    java-version: openjdk11
+    mvn-version: 'mvn38'
 
 - project:
-    name: sdnc-oam-clm
+    name: sdnc-oam-info
+    project-name: sdnc-oam
     jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/oam
-    project-name: 'sdnc-oam'
-    build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'sdnc-oam-settings'
+    branch: master