Restore daily builds for CCSDK and SDNC master branches

[ci-management.git] / jjb / sdnc / sdnc-apps.yaml

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 59343fb..03380e9 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -6,7 +6,7 @@
       - project-view
 
 - project:
-    name: sdnc-apps
+    name: sdnc-apps-java11
     project-name: "sdnc-apps"
     jobs:
       - gerrit-maven-verify:
@@ -15,7 +15,6 @@
           container-staging-registry: "nexus3.onap.org:10003"
           mvn-params: "-Ddocker.skip.push=true -Pdocker"
       - gerrit-maven-merge:
-          cron: "@daily"
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
@@ -29,21 +28,66 @@
           container-staging-registry: "nexus3.onap.org:10003"
           mvn-params: "-Dmaven.test.skip=true -Pdocker"
           maven-versions-plugin: true
-          cron: "@daily"
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
     project: "sdnc/apps"
     stream:
-      - "master":
-          branch: "master"
-          java-version: openjdk11
+      - "montreal":
+          branch: "montreal"
       - "london":
           branch: "london"
-          java-version: openjdk11
       - "kohn":
           branch: "kohn"
-          java-version: openjdk11
+    java-version: openjdk11
+    mvn-version: "mvn38"
+    mvn-settings: "sdnc-apps-settings"
+
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    maven-version: "mvn38"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+
+- project:
+    name: sdnc-apps-java17
+    project-name: "sdnc-apps"
+    jobs:
+      - gerrit-maven-verify:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Ddocker.skip.push=true -Pdocker"
+      - gerrit-maven-merge:
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          cron: "@daily"
+          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 -Pdocker"
+          maven-versions-plugin: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "sdnc/apps"
+    stream:
+      - "master":
+          branch: "master"
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-apps-settings"
 
@@ -67,12 +111,11 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "sdnc/apps"
     project-name: "sdnc-apps"
     branch: "master"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-apps-settings"
     mvn-goals: "clean install"
@@ -90,16 +133,7 @@
     stream:
       - "master":
           branch: "master"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-apps-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-
-- project:
-    name: sdnc-apps-info
-    project-name: sdnc-apps
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: sdnc/apps
-    branch: master