Merge "[DMAAP-DR] Fix java 17 job"

diff --git a/global-jjb b/global-jjb
index ded3781..cdd1193 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit ded3781bfc9b13b0743cc7d38f47f34a022e3fa1
+Subproject commit cdd11933d0985372daf527d7e54f2a741f62a5f0

diff --git a/jjb/portal-ng/portal-ng-bff.yaml b/jjb/portal-ng/portal-ng-bff.yaml
index c733652..8de3dd0 100644 (file)
--- a/jjb/portal-ng/portal-ng-bff.yaml
+++ b/jjb/portal-ng/portal-ng-bff.yaml
@@ -15,7 +15,7 @@
       - gerrit-info-yaml-verify
 
 - project:
-    name: portal-ng-bff-shell
+    name: portal-ng-bff-gradle-build
     project-name: "portal-ng-bff"
     project: "portal-ng/bff"
     branch: "master"
@@ -26,6 +26,7 @@
       - "master":
           branch: "master"
     mvn-settings: "portal-ng-bff-settings"
+    wrapper: true
 
 - project:
     name: portal-ng-bff-docker

diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml
index 1084da7..ef373bf 100644 (file)
--- a/jjb/portal-ng/portal-ng-history.yaml
+++ b/jjb/portal-ng/portal-ng-history.yaml
@@ -13,3 +13,32 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: portal-ng-history-gradle-build
+    project-name: "portal-ng-history"
+    project: "portal-ng/history"
+    branch: "master"
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-gradle-build
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "portal-ng-history-settings"
+    wrapper: true
+
+- project:
+    name: portal-ng-history-docker
+    project-name: "portal-ng-history"
+    project: "portal-ng/history"
+    branch: "master"
+    build-node: ubuntu1804-docker-8c-8g
+    docker-name: "onap/portal-ng/history"
+    container-tag-method: latest
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "portal-ng-history-settings"

diff --git a/jjb/portal-ng/portal-ng-preferences.yaml b/jjb/portal-ng/portal-ng-preferences.yaml
index 6847f1d..e46d731 100644 (file)
--- a/jjb/portal-ng/portal-ng-preferences.yaml
+++ b/jjb/portal-ng/portal-ng-preferences.yaml
@@ -13,3 +13,32 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: portal-ng-preferences-gradle-build
+    project-name: "portal-ng-preferences"
+    project: "portal-ng/preferences"
+    branch: "master"
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-gradle-build
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "portal-ng-preferences-settings"
+    wrapper: true
+
+- project:
+    name: portal-ng-preferences-docker
+    project-name: "portal-ng-preferences"
+    project: "portal-ng/preferences"
+    branch: "master"
+    build-node: ubuntu1804-docker-8c-8g
+    docker-name: "onap/portal-ng/preferences"
+    container-tag-method: latest
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "portal-ng-preferences-settings"