summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/aai/aai-model-loader.yaml3
-rw-r--r--jjb/ccsdk/apps.yaml2
-rw-r--r--jjb/ccsdk/ccsdk-csit.yaml10
-rw-r--r--jjb/ccsdk/ccsdk-oran.yaml2
-rw-r--r--jjb/ccsdk/cds.yaml2
-rw-r--r--jjb/ccsdk/distribution.yaml3
-rw-r--r--jjb/ccsdk/features.yaml3
-rw-r--r--jjb/ccsdk/odl-legacy.yaml2
-rw-r--r--jjb/ccsdk/parent.yaml2
-rw-r--r--jjb/ccsdk/sli.yaml2
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml71
-rw-r--r--jjb/dmaap/dmaap-kafka-client.yaml50
-rw-r--r--jjb/policy/policy-csit-verify.yaml12
-rw-r--r--jjb/policy/policy-csit.yaml13
-rw-r--r--jjb/sdnc/sdnc-apps.yaml2
-rw-r--r--jjb/sdnc/sdnc-csit.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml2
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
18 files changed, 34 insertions, 151 deletions
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index ba29a79ec..61f99141e 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -13,7 +13,6 @@
- gerrit-maven-merge:
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
@@ -31,7 +30,7 @@
mvn-settings: "aai-model-loader-settings"
files: "**"
archive-artifacts: ""
- build-node: ubuntu1804-builder-4c-4g
+ build-node: centos8-docker-4c-4g
mvn-version: "mvn36"
java-version: openjdk11
nexus-snapshot-repo: "snapshots"
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index f728bcbc2..53e7b8c8e 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -30,6 +30,8 @@
project: "ccsdk/apps"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
java-version: openjdk17
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 8c7ddb686..5fe35c9a9 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -15,10 +15,10 @@
stream:
- "master":
branch: "master"
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
- - "london":
- branch: "london"
mvn-settings: "ccsdk-distribution-settings"
mvn-version: "mvn38"
robot-options: ""
@@ -32,12 +32,16 @@
- "{project-name}-merge-verification-maven-{stream}":
mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
project-name: "ccsdk-oran"
- recipients: "bjorn.magnusson@est.tech martin.c.yan@est.tech"
+ recipients: "John.Keeney@est.tech"
# project name in gerrit
project: "ccsdk/oran"
stream:
- "master":
branch: "master"
+ - "newdelhi":
+ branch: "newdelhi"
+ - "montreal":
+ branch: "montreal"
- "london":
branch: "london"
java-version: openjdk17
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 97e80332e..2c4c87d35 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -24,6 +24,8 @@
build-node: centos7-docker-2c-1g
project: "ccsdk/oran"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
- "london":
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 0c5431f26..b8d9833bd 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -23,6 +23,8 @@
project: "ccsdk/cds"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
java-version: openjdk17
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 2b724916b..c8310ba79 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -25,6 +25,9 @@
project: "ccsdk/distribution"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
+ java-version: openjdk17
- "montreal":
branch: "montreal"
java-version: openjdk17
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 69a5320d8..0c40403b4 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -18,6 +18,9 @@
project: "ccsdk/features"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
+ mvn-opts: "-Xmx3072m"
- "montreal":
branch: "montreal"
mvn-opts: "-Xmx3072m"
diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
index cef17dca5..09695ffe1 100644
--- a/jjb/ccsdk/odl-legacy.yaml
+++ b/jjb/ccsdk/odl-legacy.yaml
@@ -26,6 +26,8 @@
stream:
- "master":
branch: "master"
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
java-version: openjdk17
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 6ca6c587a..a4f525c48 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -20,6 +20,8 @@
nexus-snapshot-repo: "snapshots"
project: "ccsdk/parent"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
java-version: openjdk17
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 845c5d299..5e3cf6b95 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -18,6 +18,8 @@
project: "ccsdk/sli"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
java-version: openjdk17
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
deleted file mode 100644
index d247b3891..000000000
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-- project:
- name: dmaap-datarouter-java-17
- project-name: "dmaap-datarouter"
- jobs:
- - "{project-name}-{stream}-verify-java"
- - "{project-name}-{stream}-merge-java"
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- maven-versions-plugin: true
- mvn-goals: "clean package -P docker docker:build docker:push"
- container-public-registry: "nexus3.onap.org:10001"
- container-staging-registry: "nexus3.onap.org:10003"
- cron: ""
- - "{project-name}-gerrit-release-jobs":
- build-node: centos7-docker-2c-1g
- project: "dmaap/datarouter"
- stream:
- - "master":
- branch: "master"
- mvn-settings: "dmaap-datarouter-settings"
- files: "**"
- archive-artifacts: ""
- java-version: openjdk17
-
-- project:
- name: dmaap-datarouter-csit-ssl
- jobs:
- - "{project-name}-review-verification-maven-{stream}":
- mvn-goals: clean package
- mvn-params: "-P docker docker:build -DskipTests=false"
- - "{project-name}-merge-verification-maven-{stream}":
- mvn-goals: clean package
- mvn-params: "-P docker docker:build"
- project-name: "dmaap-datarouter"
- recipients: "fiachra.corcoran@est.tech"
- project: "dmaap/datarouter"
- stream:
- - "master":
- branch: "master"
- mvn-settings: "dmaap-datarouter-settings"
- robot-options: ""
-
-- project:
- name: dmaap-datarouter-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: "{sonarcloud_project_organization}"
- sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
- sonar-mvn-goal: "{sonar_mvn_goal}"
- build-node: ubuntu1804-builder-4c-4g
- project: "dmaap/datarouter"
- project-name: "dmaap-datarouter"
- branch: "master"
- mvn-settings: "dmaap-datarouter-settings"
- mvn-goals: "clean install"
- java-version: openjdk17
-
-- project:
- name: dmaap-datarouter-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: "onap-"
- project: dmaap/datarouter
- project-name: "dmaap-datarouter"
- branch: "master"
- mvn-settings: "dmaap-datarouter-settings"
- java-version: openjdk17
- mvn-version: "mvn36"
- maven-version: "mvn36"
diff --git a/jjb/dmaap/dmaap-kafka-client.yaml b/jjb/dmaap/dmaap-kafka-client.yaml
deleted file mode 100644
index 6c07340de..000000000
--- a/jjb/dmaap/dmaap-kafka-client.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- project:
- name: dmaap-kafka-client
- project-name: "dmaap-kafka-client"
- jobs:
- - "{project-name}-{stream}-verify-java"
- - "{project-name}-{stream}-merge-java"
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos8-docker-4c-4g
- maven-versions-plugin: true
- cron: ""
- - "{project-name}-gerrit-release-jobs":
- build-node: centos7-docker-2c-1g
- project: "dmaap/kafka11aaf"
- stream:
- - "master":
- branch: "master"
- mvn-settings: "dmaap-kafka11aaf-settings"
- files: "**"
- archive-artifacts: ""
- java-version: openjdk11
-
-- project:
- name: dmaap-kafka-client-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: "{sonarcloud_project_organization}"
- sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
- sonar-mvn-goal: "{sonar_mvn_goal}"
- build-node: ubuntu1804-builder-4c-4g
- project: "dmaap/kafka11aaf"
- project-name: "dmaap-kafka-client"
- branch: "master"
- mvn-settings: "dmaap-kafka11aaf-settings"
- mvn-goals: "clean install"
- mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- java-version: openjdk11
-
-- project:
- name: dmaap-kafka-client-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: "onap-"
- project: "dmaap/kafka11aaf"
- project-name: "dmaap-kafka-client"
- branch: "master"
- mvn-settings: "dmaap-kafka11aaf-settings"
- java-version: openjdk11
diff --git a/jjb/policy/policy-csit-verify.yaml b/jjb/policy/policy-csit-verify.yaml
index 6447b579b..0338f7484 100644
--- a/jjb/policy/policy-csit-verify.yaml
+++ b/jjb/policy/policy-csit-verify.yaml
@@ -126,15 +126,3 @@
branch: "newdelhi"
functionality:
- "clamp"
-
-- project:
- name: policy-apex-pdp-postgres-project-csit-verify
- jobs:
- - "{project-name}-{stream}-project-csit-verify-{functionality}"
- project-name: "policy-apex-pdp"
- project: "policy/docker"
- stream:
- - "master":
- branch: "master"
- functionality:
- - "apex-pdp-postgres"
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index d88070ab7..b85e97b09 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -134,16 +134,3 @@
branch: "newdelhi"
functionality:
- "clamp"
-
-- project:
- name: policy-apex-pdp-postgres-project-csit
- jobs:
- - "{project-name}-{stream}-project-csit-{functionality}"
- project-name: "policy-apex-pdp"
- recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com"
- project: "policy/docker"
- stream:
- - "master":
- branch: "master"
- functionality:
- - "apex-pdp-postgres"
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 856ddc7b4..6f725453a 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -81,6 +81,8 @@
project: "sdnc/apps"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
- "master":
branch: "master"
java-version: openjdk17
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 571cbb756..98058d94d 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -15,6 +15,8 @@
stream:
- "master":
branch: "master"
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
mvn-settings: "sdnc-oam-settings"
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 479fed277..ce481bab5 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -15,6 +15,8 @@
project: "sdnc/northbound"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
java-version: openjdk17
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 7f8f48ee3..ae52fd75c 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -23,6 +23,8 @@
build-node: centos7-docker-2c-1g
project: "sdnc/oam"
stream:
+ - "newdelhi":
+ branch: "newdelhi"
- "montreal":
branch: "montreal"
java-version: openjdk17