summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/config-params.yaml3
l---------jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/content1
l---------jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.sandbox.yaml1
-rw-r--r--jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.yaml18
-rw-r--r--jjb/cps/cps-ncmp-dmi-plugin.yaml51
-rw-r--r--jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml4
-rw-r--r--jjb/oom-platform-cert-service/oom-platform-cert-service.yaml4
-rw-r--r--jjb/oom/offline-installer.yaml8
-rw-r--r--jjb/oom/oom-helm.yaml8
-rw-r--r--jjb/oom/oom-main-linter.yaml4
-rw-r--r--jjb/portal-ng-e2e/portal-ng-e2e.yaml15
-rw-r--r--jjb/portal-ng/portal-ng-bff.yaml3
-rw-r--r--jjb/portal-ng/portal-ng-history.yaml29
-rw-r--r--jjb/portal-ng/portal-ng-preferences.yaml29
14 files changed, 151 insertions, 27 deletions
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/config-params.yaml
new file mode 100644
index 000000000..53bad9df6
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "portal-ng-e2e"
+comment: "portal-ng-e2e"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/content b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/content
new file mode 120000
index 000000000..e830ebdd5
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content \ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.sandbox.yaml
new file mode 120000
index 000000000..8f9205792
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml \ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.yaml
new file mode 100644
index 000000000..aa02b83f6
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+ - serverId: "ecomp-snapshots"
+ credentialsId: "portal-ng-e2e"
+ - serverId: "ecomp-site"
+ credentialsId: "portal-ng-e2e"
+ - serverId: "ecomp-staging"
+ credentialsId: "portal-ng-e2e"
+ - serverId: "nexus3.onap.org:10001"
+ credentialsId: "portal-ng-e2e"
+ - serverId: "nexus3.onap.org:10002"
+ credentialsId: "portal-ng-e2e"
+ - serverId: "nexus3.onap.org:10003"
+ credentialsId: "portal-ng-e2e"
+ - serverId: "nexus3.onap.org:10004"
+ credentialsId: "portal-ng-e2e"
+ - serverId: "docker.io"
+ credentialsId: "onap_dockerhub_creds"
diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 908f86531..ee12b056b 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -14,8 +14,8 @@
- gerrit-info-yaml-verify
- project:
- name: cps-ncmp-dmi-plugin
- java-version: openjdk11
+ name: cps-ncmp-dmi-plugin-java17
+ java-version: openjdk17
mvn-version: mvn36
maven-version: mvn36
project-name: cps-ncmp-dmi-plugin
@@ -42,15 +42,44 @@
stream:
- "master":
branch: master
- - "jakarta":
- branch: "jakarta"
+ - "london":
+ branch: "london"
cron: ""
+ mvn-settings: cps-ncmp-dmi-plugin-settings
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-docker-8c-8g
+
+- project:
+ name: cps-ncmp-dmi-plugin-java11
+ java-version: openjdk11
+ mvn-version: mvn36
+ maven-version: mvn36
+ project-name: cps-ncmp-dmi-plugin
+ project: cps/ncmp-dmi-plugin
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ jobs:
+ - gerrit-maven-docker-verify:
+ container-public-registry: nexus3.onap.org:10001
+ - gerrit-maven-merge
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ sbom-generator: true
+ - gerrit-maven-docker-stage:
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-params: -Pdocker
+ container-public-registry: nexus3.onap.org:10001
+ container-staging-registry: nexus3.onap.org:10003
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ stream:
- "kohn":
branch: "kohn"
cron: ""
- - "london":
- branch: "london"
- cron: ""
mvn-settings: cps-ncmp-dmi-plugin-settings
files: "**"
archive-artifacts: ""
@@ -58,7 +87,7 @@
- project:
name: cps-ncmp-dmi-plugin-clm
- java-version: openjdk11
+ java-version: openjdk17
mvn-version: mvn36
maven-version: mvn36
jobs:
@@ -72,7 +101,7 @@
- project:
name: cps-ncmp-dmi-plugin-sonar
- java-version: openjdk11
+ java-version: openjdk17
mvn-version: mvn36
maven-version: mvn36
jobs:
@@ -88,11 +117,10 @@
branch: "master"
mvn-settings: "cps-ncmp-dmi-plugin-settings"
mvn-goals: "clean install"
- mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: cps-ncmp-dmi-plugin-sonar-verify
- java-version: openjdk11
+ java-version: openjdk17
mvn-version: "mvn36"
maven-version: "mvn36"
jobs:
@@ -108,4 +136,3 @@
branch: "master"
mvn-settings: "cps-ncmp-dmi-plugin-settings"
mvn-goals: "clean install"
- mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index 46b1099be..450144f80 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -9,8 +9,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- "certservice":
trigger_jobs:
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 540746a74..174936f7e 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -20,8 +20,8 @@
- "master":
branch: "master"
java-version: openjdk11
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
java-version: openjdk11
project: "oom/platform/cert-service"
mvn-settings: "oom-platform-cert-service-settings"
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 55e44ede3..3f74e44a0 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -8,8 +8,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
jobs:
- "{project-name}-{stream}-review":
@@ -39,8 +39,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
- project:
name: offline-installer-pytest
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 0f8142658..0753e1cdc 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -15,8 +15,8 @@
branch: "master"
- "kohn":
branch: "kohn"
- - "jakarta":
- branch: "jakarta"
+ - "london":
+ branch: "london"
jobs:
- "{project-name}-{stream}-image-verify":
@@ -50,8 +50,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
jobs:
- "{project-name}-{stream}-verify-make-{helm_bin}":
diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
index 21e670613..b3e4df2f4 100644
--- a/jjb/oom/oom-main-linter.yaml
+++ b/jjb/oom/oom-main-linter.yaml
@@ -33,5 +33,5 @@
branch: "master"
- "kohn":
branch: "kohn"
- - "jakarta":
- branch: "jakarta"
+ - "london":
+ branch: "london"
diff --git a/jjb/portal-ng-e2e/portal-ng-e2e.yaml b/jjb/portal-ng-e2e/portal-ng-e2e.yaml
new file mode 100644
index 000000000..4670af8a9
--- /dev/null
+++ b/jjb/portal-ng-e2e/portal-ng-e2e.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: portal-ng-e2e-project-view
+ project-name: portal-ng-e2e
+ views:
+ - project-view
+
+- project:
+ name: portal-ng-e2e-info
+ project: portal-ng/e2e
+ project-name: portal-ng-e2e
+ build-node: centos8-builder-2c-1g
+ branch: master
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/portal-ng/portal-ng-bff.yaml b/jjb/portal-ng/portal-ng-bff.yaml
index c733652b5..8de3dd09a 100644
--- 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 1084da75d..ef373bfa2 100644
--- 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 6847f1df1..e46d7314c 100644
--- 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"