diff options
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 27 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-datarouter.yaml | 28 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml | 27 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-messagerouter-kafka.yaml | 23 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-messagerouter-messageservice.yaml | 30 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-messagerouter-zookeeper.yaml | 24 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-workflow-designer.yaml | 5 |
7 files changed, 19 insertions, 145 deletions
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index a89f6bd1a..b74439e86 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -6,7 +6,7 @@ - project-view - project: - name: dmaap-buscontroller-java11 + name: dmaap-buscontroller-java project-name: 'dmaap-buscontroller' jobs: - '{project-name}-{stream}-verify-java' @@ -22,35 +22,14 @@ stream: - 'master': branch: 'master' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' java-version: openjdk11 - project: - name: dmaap-buscontroller-maintenance-java11 - project-name: 'dmaap-buscontroller-maintenance' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-goals: 'clean package -P docker docker:build docker:push -DskipTests=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'dmaap/buscontroller' - stream: - - 'istanbul': - branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' - mvn-settings: 'dmaap-buscontroller-settings' - files: '**' - archive-artifacts: '' - java-version: openjdk11 - cron: '' - -- project: name: dmaap-buscontroller-csit jobs: - '{project-name}-review-verification-maven-{stream}': diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 1a8f5ffad..530a7b2a7 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -1,6 +1,6 @@ --- - project: - name: dmaap-datarouter-java11 + name: dmaap-datarouter-java project-name: 'dmaap-datarouter' jobs: - '{project-name}-{stream}-verify-java' @@ -17,36 +17,14 @@ stream: - 'master': branch: 'master' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dmaap-datarouter-settings' files: '**' archive-artifacts: '' java-version: openjdk11 - project: - name: dmaap-datarouter-maintenance-java11 - project-name: 'dmaap-datarouter-maintenance' - 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' - project: 'dmaap/datarouter' - stream: - - 'istanbul': - branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' - mvn-settings: 'dmaap-datarouter-settings' - files: '**' - archive-artifacts: '' - java-version: openjdk11 - cron: '' - -- project: name: dmaap-datarouter-csit-ssl jobs: - '{project-name}-review-verification-maven-{stream}': diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 8e0dbf6c5..34fe57b47 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-dmaapclient-java11 - project-name: 'dmaap-messagerouter-dmaapclient-java11' + name: dmaap-messagerouter-dmaapclient-java + project-name: 'dmaap-messagerouter-dmaapclient-java' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -15,33 +15,14 @@ stream: - 'master': branch: 'master' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' files: '**' archive-artifacts: '' java-version: openjdk11 - project: - name: dmaap-messagerouter-dmaapclient-maintenance - project-name: 'dmaap-messagerouter-dmaapclient-maintenance' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - project: 'dmaap/messagerouter/dmaapclient' - stream: - - 'istanbul': - branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' - mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' - files: '**' - archive-artifacts: '' - cron: '' - -- project: name: dmaap-messagerouter-dmaapclient-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml index ff785c55e..8b404eaee 100644 --- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml +++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml @@ -23,29 +23,6 @@ java-version: openjdk11 - project: - name: dmaap-kafka-maintenance - project-name: 'dmaap-kafka-maintenance' - 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-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'dmaap/kafka11aaf' - stream: - - 'istanbul': - branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' - mvn-settings: 'dmaap-kafka11aaf-settings' - files: '**' - archive-artifacts: '' - cron: '' - -- project: name: dmaap-kafka-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 8320488f9..a6796663c 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-messageservice-java-11 - project-name: 'dmaap-messagerouter-messageservice-java-11' + name: dmaap-messagerouter-messageservice-java + project-name: 'dmaap-messagerouter-messageservice-java' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -17,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dmaap-messagerouter-messageservice-settings' java-version: openjdk11 files: '**' @@ -25,30 +27,6 @@ mvn-profile: 'docker' - project: - name: dmaap-messagerouter-messageservice-maintenance - project-name: 'dmaap-messagerouter-messageservice-maintenance' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-params: '-P docker -Dmaven.test.skip=true' - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'dmaap/messagerouter/messageservice' - stream: - - 'istanbul': - branch: 'istanbul' - mvn-settings: 'dmaap-messagerouter-messageservice-settings' - java-version: openjdk11 - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - cron: '' - -- project: name: dmaap-csit jobs: - '{project-name}-review-verification-maven-{stream}': diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml index 8186cc314..bb778ac35 100644 --- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml +++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml @@ -23,30 +23,6 @@ build-node: ubuntu1804-docker-8c-8g - project: - name: dmaap-zookeeper-maintenance - project-name: 'dmaap-zookeeper-maintenance' - jobs: - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-params: '-P docker -Dmaven.test.skip=true' - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'dmaap/zookeeper' - stream: - - 'istanbul': - branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' - mvn-settings: 'dmaap-zookeeper-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - build-node: ubuntu1804-docker-8c-8g - cron: '' - -- project: name: dmaap-zookeeper-info project-name: dmaap-zookeeper jobs: diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 43f0db8ed..e4eff9dec 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -4,6 +4,7 @@ project-name: sdc-sdc-workflow views: - project-view + java-version: openjdk11 - project: name: sdc-sdc-workflow-designer @@ -23,6 +24,7 @@ container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + java-version: openjdk11 project: 'sdc/sdc-workflow-designer' stream: @@ -56,6 +58,7 @@ mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + java-version: openjdk11 - project: name: sdc-sdc-workflow-designer-clm @@ -71,6 +74,7 @@ - 'jakarta': branch: 'jakarta' mvn-settings: 'sdc-sdc-workflow-designer-settings' + java-version: openjdk11 - project: name: sdc-sdc-workflow-designer-info @@ -80,3 +84,4 @@ build-node: centos7-builder-2c-1g project: sdc/sdc-workflow-designer branch: master + java-version: openjdk11 |