From: Jessica Wagantall Date: Thu, 16 May 2019 17:24:11 +0000 (+0000) Subject: Merge "Migrate to gerrit-maven-stage (CLAMP)" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c0ad7406de27aa3dc3fbc1c5c8fd7d15cd73dc7e;hp=d602105e1d9a2df44481fb7860dbf7f5c43ca68f;p=ci-management.git Merge "Migrate to gerrit-maven-stage (CLAMP)" --- diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index 42ed60897..abdc7c73c 100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -25,8 +25,9 @@ please send email to helpdesk@onap.org (LF helpdesk team) To download **ci-management**, execute the following command to clone the **ci-managment** repository. -`git clone ssh://@gerrit.onap.org:29418/ci-management --recursive && scp -p -P 29418 \ -@gerrit.onap.org:hooks/commit-msg ci-management/.git/hooks/` +`git clone https://gerrit.onap.org/r/ci-management && (cd ci-management && curl -Lo \ +$(git rev-parse --git-dir)/hooks/commit-msg https://gerrit.onap.org/r/tools/hooks/commit-msg; \ +chmod +x $(git rev-parse --git-dir)/hooks/commit-msg)` Make sure to sync global-jjb submodule using: @@ -51,7 +52,7 @@ jenkins-jobs test --recursive jjb/ Backup the jenkins.ini.example to jenkins.ini -`cp jenkins.ini.example jenkins.ini` +`cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini` After copying the jenkins.ini.example, modify `jenkins.ini` with your **Jenkins LFID username**, **API token** and **ONAP jenkins sandbox URL** @@ -72,7 +73,9 @@ ignore_cache=True ``` ### How to retrieve API token? Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user -page by clicking on your username. Click **Configure** and then click **Show API Token**. +page by clicking on your username. Click **Configure** and then click **Add new Token**. +After that specify a token name (optional) and click on **Generate** to generate and show +new token. Please note down your token and store it securely. To work on existing jobs or create new jobs, navigate to the `/jjb` directory where you will find all job templates for the project. Follow the below commands to test, @@ -83,9 +86,9 @@ update or delete jobs in your sandbox environment. After you modify or create jobs in the above environment, it's good practice to test the job in sandbox environment before you submit this job to production CI environment. -`jenkins-jobs --conf jenkins.ini test jjb/ ` +`jenkins-jobs test jjb/ ` -**Example:** `jenkins-jobs --conf jenkins.ini test jjb/ sdc-master-verify-java` +**Example:** `jenkins-jobs test jjb/ sdc-master-verify-java` If the job you’d like to test is a template with variables in its name, it must be manually expanded before use. For example, the commonly used template `sdc-{stream}-verify-java` @@ -96,7 +99,7 @@ specified JJB job name. Execute the following command to pipe-out to a directory: -`jenkins-jobs --conf jenkins.ini test jjb/ -o ` +`jenkins-jobs test jjb/ -o ` The output directory will contain files with the XML configurations. @@ -107,9 +110,9 @@ outputting valid XML descriptions of Jenkins jobs. Upon successful verification, execute the following command to update the job to the Jenkins sandbox. -`jenkins-jobs --conf jenkins.ini update jjb/ ` +`jenkins-jobs update jjb/ ` -**Example:** `jenkins-jobs --conf jenkins.ini update jjb/ sdc-master-verify-java` +**Example:** `jenkins-jobs update jjb/ sdc-master-verify-java` ## Trigger jobs from Jenkins Sandbox: @@ -132,9 +135,9 @@ details and the console output. Execute the following command to Delete a job from Sandbox: -`jenkins-jobs --conf jenkins.ini delete jjb/ ` +`jenkins-jobs delete jjb/ ` -**Example:** `jenkins-jobs --conf jenkins.ini delete jjb/ sdc-master-verify-java` +**Example:** `jenkins-jobs delete jjb/ sdc-master-verify-java` The above command would delete the `sdc-master-verify-java` job. diff --git a/global-jjb b/global-jjb index 1f1f893e7..59af00afa 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 1f1f893e77014a6b08d61e88614ff928b2c17587 +Subproject commit 59af00afa9923c744db50cd105f9bb27b7356aaa diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg new file mode 100644 index 000000000..9d6518407 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190507-002922.623 +LABELS=centos7-docker-8c-8g +HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg index c328e94f3..f47c417cb 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20181031-164620.606 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20190410-005349.357 LABELS=ubuntu1604-docker-arm64-4c-2g HARDWARE_ID=lf-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg index 60167f281..db219ca50 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190123-052615.439 LABELS=ubuntu1604-docker-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg new file mode 100644 index 000000000..a3bdd73ff --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904 +LABELS=ubuntu1604-docker-8c-8g +HARDWARE_ID=v1-standard-8 diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh index 67987b54d..dd76d8a74 100755 --- a/jenkins-scripts/jenkins-init-script.sh +++ b/jenkins-scripts/jenkins-init-script.sh @@ -25,3 +25,6 @@ fi # Create the jenkins user last so that hopefully we don't have to deal with # guard files ./create_jenkins_user.sh + +# Nexus3 port forwarding rules for ARM64 +./nexus3_port_forwarding.sh diff --git a/jenkins-scripts/nexus3_port_forwarding.sh b/jenkins-scripts/nexus3_port_forwarding.sh new file mode 100755 index 000000000..31d41b2c8 --- /dev/null +++ b/jenkins-scripts/nexus3_port_forwarding.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 2019 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## +echo "---> nexus3_port_forwarding.sh" +set +e # DON'T fail build if script fails. + +NEXUS3_IP=`host nexus3.onap.org | awk '/has address/ { print $4 ; exit }'` +OS_ARCH=$(ANSIBLE_STDOUT_CALLBACK=json ANSIBLE_LOAD_CALLBACK_PLUGINS=1 \ + ansible all -i "localhost," --connection=local -m setup | jq -r \ + '.. | .ansible_architecture? | select(type != "null")' \ + | tr '[:upper:]' '[:lower:]') + + +if [[ "${OS_ARCH}" == "aarch64" ]] ;then + echo "os_arch: $OS_ARCH" + iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10001 -j DNAT --to-destination ${NEXUS3_IP}:11001 + iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10002 -j DNAT --to-destination ${NEXUS3_IP}:11002 + iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10003 -j DNAT --to-destination ${NEXUS3_IP}:11003 +fi + +# DON'T fail build if script fails. +exit 0 diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 8bfd2aafe..4cb73592a 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -67,3 +67,11 @@ project-name: 'aaf-authz' branch: 'master' mvn-settings: 'aaf-authz-settings' + +- project: + name: aaf-authz-info + project-name: aaf-authz + jobs: + - gerrit-info-yaml-verify + project: aaf/authz + branch: master diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 523c67e90..a605a811c 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -116,3 +116,11 @@ project-name: 'aaf-cadi' branch: 'master' mvn-settings: 'aaf-cadi-settings' + +- project: + name: aaf-cadi-info + project-name: aaf-cadi + jobs: + - gerrit-info-yaml-verify + project: aaf/cadi + branch: master diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml index 14bb22f41..873382332 100644 --- a/jjb/aaf/aaf-luaplugin.yaml +++ b/jjb/aaf/aaf-luaplugin.yaml @@ -8,3 +8,11 @@ project: 'aaf/luaplugin' branch: 'master' mvn-settings: 'aaf-luaplugin-settings' + +- project: + name: aaf-luaplugin-info + project-name: aaf-luaplugin + jobs: + - gerrit-info-yaml-verify + project: aaf/luaplugin + branch: master diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml index 3e0e8cdfa..634189213 100644 --- a/jjb/aaf/aaf-sms.yaml +++ b/jjb/aaf/aaf-sms.yaml @@ -22,3 +22,11 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: aaf-sms-info + project-name: aaf-sms + jobs: + - gerrit-info-yaml-verify + project: aaf/sms + branch: master diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml index 0782b9dd1..31e700671 100644 --- a/jjb/aaf/aaf-sshsm.yaml +++ b/jjb/aaf/aaf-sshsm.yaml @@ -5,10 +5,10 @@ build-timeout: 120 project: 'aaf/sshsm' jobs: - - '{project-name}-{stream}-verify-c': + - gerrit-verify-c: script: !include-raw-escape: 'build-sshsm.sh' - - '{project-name}-{stream}-docker-c-shell-daily': + - gerrit-docker-c-shell-daily: script: !include-raw-escape: 'build-sshsm-docker-images.sh' stream: @@ -19,3 +19,11 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: aaf-sshsm-info + project-name: aaf-sshsm + jobs: + - gerrit-info-yaml-verify + project: aaf/sshsm + branch: master diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 4dddda5a3..3b6337d5e 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -16,8 +16,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: '**' @@ -32,7 +32,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-aai-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,7 +47,15 @@ project: 'aai/aai-common' project-name: 'aai-aai-common' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' + +- project: + name: aai-aai-common-info + project-name: aai-aai-common + jobs: + - gerrit-info-yaml-verify + project: aai/aai-common + branch: master diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index fc886cf6b..3f5e6e47a 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -18,8 +18,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'aai/babel' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-babel-settings' @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/babel' project-name: 'aai-babel' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-babel-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,8 +48,16 @@ project: 'aai/babel' project-name: 'aai-babel' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-babel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: aai-babel-info + project-name: aai-babel + jobs: + - gerrit-info-yaml-verify + project: aai/babel + branch: master diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 0e90a12b7..06edc0c44 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -15,8 +15,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' files: '**' @@ -31,7 +31,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/cacher' project-name: 'aai-cacher' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-cacher-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -45,8 +45,16 @@ project: 'aai/cacher' project-name: 'aai-cacher' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' + +- project: + name: aai-cacher-info + project-name: aai-cacher + jobs: + - gerrit-info-yaml-verify + project: aai/cacher + branch: master diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index a3befbb0a..fc7fdab21 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -18,8 +18,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'aai/chameleon' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-chameleon-settings' @@ -35,6 +35,14 @@ project: 'aai/chameleon' project-name: 'aai-chameleon' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-chameleon-settings' + +- project: + name: aai-chameleon-info + project-name: aai-chameleon + jobs: + - gerrit-info-yaml-verify + project: aai/chameleon + branch: master diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index c83335b78..fb5a3ab16 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -20,8 +20,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-champ-settings' files: '**' archive-artifacts: '' @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/champ' project-name: 'aai-champ' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-champ-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,6 +48,14 @@ project: 'aai/champ' project-name: 'aai-champ' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-champ-settings' + +- project: + name: aai-champ-info + project-name: aai-champ + jobs: + - gerrit-info-yaml-verify + project: aai/champ + branch: master diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 870f9bcbe..5f49aef7b 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -18,8 +18,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'aai/data-router' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-data-router-settings' @@ -34,7 +34,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/data-router' project-name: 'aai-data-router' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-data-router-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,6 +47,14 @@ project: 'aai/data-router' project-name: 'aai-data-router' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-data-router-settings' + +- project: + name: aai-data-router-info + project-name: aai-data-router + jobs: + - gerrit-info-yaml-verify + project: aai/data-router + branch: master diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index c473cdab0..6f9d56126 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-esr-gui-settings' files: '**' archive-artifacts: '' @@ -36,6 +36,14 @@ project: 'aai/esr-gui' project-name: 'aai-esr-gui' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-esr-gui-settings' + +- project: + name: aai-esr-gui-info + project-name: aai-esr-gui + jobs: + - gerrit-info-yaml-verify + project: aai/esr-gui + branch: master diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 0d8c99089..21567fbde 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-esr-server-settings' files: '**' archive-artifacts: '' @@ -49,6 +49,14 @@ project: 'aai/esr-server' project-name: 'aai-esr-server' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-esr-server-settings' + +- project: + name: aai-esr-server-info + project-name: aai-esr-server + jobs: + - gerrit-info-yaml-verify + project: aai/esr-server + branch: master diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index ad7da4cd8..3b29da3de 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -14,8 +14,8 @@ - '{project-name}-{stream}-release-version-java-daily' project: 'aai/event-client' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-event-client-settings' @@ -43,6 +43,14 @@ project: 'aai/event-client' project-name: 'aai-event-client' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-event-client-settings' + +- project: + name: aai-event-client-info + project-name: aai-event-client + jobs: + - gerrit-info-yaml-verify + project: aai/event-client + branch: master diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index fefd7c901..1f575ea64 100644 --- a/jjb/aai/aai-gallifrey.yaml +++ b/jjb/aai/aai-gallifrey.yaml @@ -12,8 +12,8 @@ build-node: 'ubuntu1604-docker-8c-8g' project: 'aai/gallifrey' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-gallifrey-settings' @@ -28,6 +28,14 @@ project: 'aai/gallifrey' project-name: 'aai-gallifrey' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-gallifrey-settings' + +- project: + name: aai-gallifrey-info + project-name: aai-gallifrey + jobs: + - gerrit-info-yaml-verify + project: aai/gallifrey + branch: master diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index bb460182c..76ba0eac5 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -18,8 +18,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'aai/gizmo' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-gizmo-settings' @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/gizmo' project-name: 'aai-gizmo' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-gizmo-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,6 +48,14 @@ project: 'aai/gizmo' project-name: 'aai-gizmo' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-gizmo-settings' + +- project: + name: aai-gizmo-info + project-name: aai-gizmo + jobs: + - gerrit-info-yaml-verify + project: aai/gizmo + branch: master diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 7e608e190..646e8536a 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' files: '**' @@ -37,7 +37,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/graphadmin' project-name: 'aai-graphadmin' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-graphadmin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -51,7 +51,15 @@ project: 'aai/graphadmin' project-name: 'aai-graphadmin' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' + +- project: + name: aai-graphadmin-info + project-name: aai-graphadmin + jobs: + - gerrit-info-yaml-verify + project: aai/graphadmin + branch: master diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 5464086af..31cedd15b 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -11,6 +11,13 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + build-node: ubuntu1604-docker-2c-4g + project: 'aai/graphgraph' stream: - 'master': @@ -18,3 +25,11 @@ mvn-settings: 'aai-graphgraph-settings' files: '**' archive-artifacts: '' + +- project: + name: aai-graphgraph-info + project-name: aai-graphgraph + jobs: + - gerrit-info-yaml-verify + project: aai/graphgraph + branch: master diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 566ae9089..ac64c91ea 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -14,8 +14,8 @@ - '{project-name}-{stream}-release-version-java-daily' project: 'aai/logging-service' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-logging-service-settings' @@ -43,6 +43,14 @@ project: 'aai/logging-service' project-name: 'aai-logging-service' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-logging-service-settings' + +- project: + name: aai-logging-service-info + project-name: aai-logging-service + jobs: + - gerrit-info-yaml-verify + project: aai/logging-service + branch: master diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index b9382be24..0546abca2 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -18,8 +18,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'aai/model-loader' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-model-loader-settings' @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/model-loader' project-name: 'aai-model-loader' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-model-loader-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,6 +48,14 @@ project: 'aai/model-loader' project-name: 'aai-model-loader' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-model-loader-settings' + +- project: + name: aai-model-loader-info + project-name: aai-model-loader + jobs: + - gerrit-info-yaml-verify + project: aai/model-loader + branch: master diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml new file mode 100644 index 000000000..816ecff2e --- /dev/null +++ b/jjb/aai/aai-oom.yaml @@ -0,0 +1,37 @@ +--- +- project: + name: aai-oom-project-view + project-name: aai-oom + views: + - project-view + +- project: + name: aai-oom + helm-module: 'aai' + project-name: 'aai-oom' + project: 'aai/oom' + jobs: + - '{project-name}-{stream}-verify-external-helm' + - '{project-name}-{stream}-merge-external-helm': + build_script: '{oom_build_script}' + post_build_script: !include-raw-escape: shell/publish_helm_charts.sh + files: '**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-oom-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-helm-2c-1g + pre_build_script: !include-raw-escape: shell/helm-repo-init.sh + oom_build_script: | + #!/bin/bash + set -e -o pipefail + cd kubernetes/ + make all + build_script: | + #!/bin/bash + cd kubernetes/ + make common + make {helm-module} + oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 30338af63..96234eb7e 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' files: '**' @@ -37,7 +37,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/resources' project-name: 'aai-resources' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-resources-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -51,7 +51,15 @@ project: 'aai/resources' project-name: 'aai-resources' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' + +- project: + name: aai-resources-info + project-name: aai-resources + jobs: + - gerrit-info-yaml-verify + project: aai/resources + branch: master diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 025fc7fc2..a6fd5a1b3 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -14,8 +14,8 @@ - '{project-name}-{stream}-release-version-java-daily' project: 'aai/rest-client' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-rest-client-settings' @@ -43,6 +43,14 @@ project: 'aai/rest-client' project-name: 'aai-rest-client' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-rest-client-settings' + +- project: + name: aai-rest-client-info + project-name: aai-rest-client + jobs: + - gerrit-info-yaml-verify + project: aai/rest-client + branch: master diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index d7e2e22a3..92e3e24fb 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -14,8 +14,8 @@ - '{project-name}-{stream}-release-version-java-daily' project: 'aai/router-core' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-router-core-settings' @@ -43,6 +43,14 @@ project: 'aai/router-core' project-name: 'aai-router-core' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-router-core-settings' + +- project: + name: aai-router-core-info + project-name: aai-router-core + jobs: + - gerrit-info-yaml-verify + project: aai/router-core + branch: master diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index e4c4bd1a9..020372972 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -33,9 +33,9 @@ - gerrit-maven-sonar cron: '@daily' build-node: ubuntu1604-builder-4c-4g - project: 'aai/resources' + project: 'aai/schema-service' project-name: 'aai-schema-service' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-schema-service-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -46,10 +46,18 @@ jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: 'aai/resources' + project: 'aai/schema-service' project-name: 'aai-schema-service' stream: - 'master': branch: 'master' mvn-settings: 'aai-schema-service-settings' mvn-version: 'mvn35' + +- project: + name: aai-schema-service-info + project-name: aai-schema-service + jobs: + - gerrit-info-yaml-verify + project: aai/schema-service + branch: master diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index bd44eb4fa..a111ffde9 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -13,13 +13,31 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' + pom: 'search-data-service-app/pom.xml' mvn-goals: 'docker:build' build-node: ubuntu1604-docker-8c-8g project: 'aai/search-data-service' + docker-image-name: 'onap/search-data-service' + stream: + - 'dublin': + branch: 'dublin' + - 'master': + branch: 'master' + mvn-settings: 'aai-search-data-service-settings' + files: '**' + archive-artifacts: '' + +- project: + name: aai-search-data-service-searchguard + project-name: 'aai-search-data-service-searchguard' + jobs: + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'elasticsearch-sg/pom.xml' + mvn-goals: 'docker:build' + build-node: ubuntu1604-docker-8c-8g + project: 'aai/search-data-service' + docker-image-name: 'onap/elasticsearch-sg' stream: - - 'casablanca': - branch: 'casablanca' - 'master': branch: 'master' mvn-settings: 'aai-search-data-service-settings' @@ -34,7 +52,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/search-data-service' project-name: 'aai-search-data-service' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-search-data-service-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,6 +65,14 @@ project: 'aai/search-data-service' project-name: 'aai-search-data-service' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-search-data-service-settings' + +- project: + name: aai-search-data-service-info + project-name: aai-search-data-service + jobs: + - gerrit-info-yaml-verify + project: aai/search-data-service + branch: master diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 2a9c88631..373a1aa17 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -18,8 +18,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'aai/sparky-be' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-sparky-be-settings' @@ -34,7 +34,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/sparky-be' project-name: 'aai-sparky-be' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-sparky-be-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,6 +47,14 @@ project: 'aai/sparky-be' project-name: 'aai-sparky-be' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-sparky-be-settings' + +- project: + name: aai-sparky-be-info + project-name: aai-sparky-be + jobs: + - gerrit-info-yaml-verify + project: aai/sparky-be + branch: master diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 08106bd97..c75d5bf49 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -9,10 +9,18 @@ - '{project-name}-{stream}-release-version-java-daily' project: 'aai/sparky-fe' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-sparky-fe-settings' files: '**' archive-artifacts: '' + +- project: + name: aai-sparky-fe-info + project-name: aai-sparky-fe + jobs: + - gerrit-info-yaml-verify + project: aai/sparky-fe + branch: master diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index 5dd744b34..7f01185d8 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -18,8 +18,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'aai/spike' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-spike-settings' @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/spike' project-name: 'aai-spike' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-spike-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,6 +47,14 @@ project: 'aai/spike' project-name: 'aai-spike' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-spike-settings' + +- project: + name: aai-spike-info + project-name: aai-spike + jobs: + - gerrit-info-yaml-verify + project: aai/spike + branch: master diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 83acb9e26..26c8713ef 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' files: '**' @@ -37,7 +37,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/traversal' project-name: 'aai-traversal' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-traversal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -51,7 +51,15 @@ project: 'aai/traversal' project-name: 'aai-traversal' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' + +- project: + name: aai-traversal-info + project-name: aai-traversal + jobs: + - gerrit-info-yaml-verify + project: aai/traversal + branch: master diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index ea7319c71..52dc8af80 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -18,8 +18,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'aai/validation' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-validation-settings' @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/validation' project-name: 'aai-validation' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-validation-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,7 +48,15 @@ project: 'aai/validation' project-name: 'aai-validation' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-validation-settings' + +- project: + name: aai-validation-info + project-name: aai-validation + jobs: + - gerrit-info-yaml-verify + project: aai/validation + branch: master diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml index 4253db44b..d66a9025c 100644 --- a/jjb/appc/appc-cdt.yaml +++ b/jjb/appc/appc-cdt.yaml @@ -5,14 +5,17 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true project: 'appc/cdt' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-cdt-settings' files: '**' archive-artifacts: '' @@ -28,3 +31,11 @@ branch: 'master' mvn-settings: 'appc-cdt-settings' + +- project: + name: appc-cdt-info + project-name: appc-cdt + jobs: + - gerrit-info-yaml-verify + project: appc/cdt + branch: master diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml index 3fe00498d..7e8dfa37a 100644 --- a/jjb/appc/appc-csit.yaml +++ b/jjb/appc/appc-csit.yaml @@ -7,9 +7,7 @@ project-name: 'appc' stream: - 'master': - branch: master - - 'casablanca': - branch: 'casablanca' + branch: 'master' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index a46313add..220e3cf46 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -6,6 +6,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-docker-image-blessing' @@ -13,8 +17,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' @@ -22,23 +26,23 @@ mvn-profile: docker build-node: ubuntu1604-builder-4c-4g -- project: - name: appc-deployment-arm64 - project-name: 'appc-deployment-arm64' - jobs: - - '{project-name}-docker-image-blessing' - - project: 'appc/deployment' - stream: - - 'master': - branch: 'master' - mvn-settings: 'appc-deployment-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: appc-deployment-arm64 +# project-name: 'appc-deployment-arm64' +# jobs: +# - '{project-name}-docker-image-blessing' +# +# project: 'appc/deployment' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'appc-deployment-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: appc-deployment-docker project-name: 'appc-deployment' @@ -51,30 +55,38 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: queue-docker-4c-4g + build-node: ubuntu1604-docker-8c-8g + +#- project: +# name: appc-deployment-arm64-docker +# project-name: 'appc-deployment-arm64' +# jobs: +# - 'docker-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# - 'docker-version-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# project: 'appc/deployment' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'appc-deployment-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g - project: - name: appc-deployment-arm64-docker - project-name: 'appc-deployment-arm64' + name: appc-deployment-info + project-name: appc-deployment jobs: - - 'docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - - 'docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - project: 'appc/deployment' - stream: - - 'master': - branch: 'master' - mvn-settings: 'appc-deployment-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g + - gerrit-info-yaml-verify + project: appc/deployment + branch: master diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 912050488..71e370009 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -7,6 +7,10 @@ build-node: ubuntu1604-builder-8c-8g - '{project-name}-{stream}-merge-java': build-node: ubuntu1604-builder-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily': build-node: ubuntu1604-builder-8c-8g @@ -14,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-settings' files: '**' archive-artifacts: '' @@ -39,10 +43,18 @@ jobs: - gerrit-maven-clm: mvn-params: '-DskipTests' - build-timeout: 30 + build-timeout: 60 build-node: ubuntu1604-builder-8c-8g nexus-iq-namespace: 'onap-' project: 'appc' project-name: 'appc' branch: 'master' mvn-settings: 'appc-settings' + +- project: + name: appc-info + project-name: appc + jobs: + - gerrit-info-yaml-verify + project: appc + branch: master diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index 99025ac08..efb25d02e 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -11,13 +11,24 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true project: 'appc/parent' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-parent-settings' build-node: ubuntu1604-builder-2c-1g + +- project: + name: appc-parent-info + project-name: appc-parent + jobs: + - gerrit-info-yaml-verify + project: appc/parent + branch: master diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index f85ad5f62..9ee4277e5 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -11,14 +11,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/apps' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-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 @@ -54,6 +59,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' build-node: ubuntu1604-builder-4c-4g @@ -69,26 +76,36 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker build-node: queue-docker-4c-4g +# +#- project: +# name: ccsdk-apps-arm64-docker +# project-name: 'ccsdk-apps-arm64' +# jobs: +# - 'docker-version-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# project: 'ccsdk/apps' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'ccsdk-apps-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g - project: - name: ccsdk-apps-arm64-docker - project-name: 'ccsdk-apps-arm64' + name: ccsdk-apps-info + project-name: ccsdk-apps jobs: - - 'docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - project: 'ccsdk/apps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-apps-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g + - gerrit-info-yaml-verify + project: ccsdk/apps + branch: master diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 2890a4e43..c97d1936b 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -10,6 +10,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index f1efc6193..421785491 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -5,12 +5,17 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/cds' stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-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 @@ -44,6 +49,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-settings' build-node: ubuntu1604-builder-4c-4g @@ -57,9 +64,19 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker build-node: queue-docker-4c-4g + +- project: + name: ccsdk-cds-info + project-name: ccsdk-cds + jobs: + - gerrit-info-yaml-verify + project: ccsdk/cds + branch: master diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml new file mode 100644 index 000000000..c3f6d0e69 --- /dev/null +++ b/jjb/ccsdk/dashboard.yaml @@ -0,0 +1,73 @@ +--- +- project: + name: ccsdk-dashboard + project-name: 'ccsdk-dashboard' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g + - '{project-name}-{stream}-release-version-java-daily' + + project: 'ccsdk/dashboard' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'ccsdk-dashboard-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: '' + build-node: ubuntu1604-docker-8c-8g + +- project: + name: ccsdk-dashboard-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: centos7-redis-4c-4g + project: 'ccsdk/dashboard' + project-name: 'ccsdk-dashboard' + branch: 'master' + mvn-settings: 'ccsdk-dashboard-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-dashboard-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'ccsdk/dashboard' + project-name: 'ccsdk-dashboard' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'ccsdk-dashboard-settings' + build-node: centos7-redis-4c-4g + +- project: + name: ccsdk-dashboard-docker + project-name: 'ccsdk-dashboard' + jobs: + - 'docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' + project: 'ccsdk/dashboard' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'ccsdk-dashboard-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker + build-node: queue-docker-4c-4g diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 174f41f80..ce8015e13 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -5,13 +5,18 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/distribution' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -31,6 +36,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -38,23 +45,23 @@ mvn-profile: docker build-node: queue-docker-4c-4g -- project: - name: ccsdk-distribution-arm64-docker - project-name: 'ccsdk-distribution-arm64' - jobs: - - 'docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - project: 'ccsdk/distribution' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-distribution-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: ccsdk-distribution-arm64-docker +# project-name: 'ccsdk-distribution-arm64' +# jobs: +# - 'docker-version-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# project: 'ccsdk/distribution' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'ccsdk-distribution-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: ccsdk-distribution-clm jobs: @@ -67,6 +74,16 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' build-node: ubuntu1604-docker-8c-8g + +- project: + name: ccsdk-distribution-info + project-name: ccsdk-distribution + jobs: + - gerrit-info-yaml-verify + project: ccsdk/distribution + branch: master diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 5a9c8ce5e..3950c9869 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -5,14 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/features' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-features-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 @@ -48,5 +53,15 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-features-settings' build-node: ubuntu1604-builder-4c-4g + +- project: + name: ccsdk-features-info + project-name: ccsdk-features + jobs: + - gerrit-info-yaml-verify + project: ccsdk/features + branch: master diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 0cebc4d1e..c0d576b84 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -5,14 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/parent' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-parent-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 @@ -34,6 +39,16 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-parent-settings' build-node: ubuntu1604-builder-4c-4g + +- project: + name: ccsdk-parent-info + project-name: ccsdk-parent + jobs: + - gerrit-info-yaml-verify + project: ccsdk/parent + branch: master diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 8610819b0..b024a7a76 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -5,14 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/platform/plugins' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-platform-plugins-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 @@ -48,6 +53,16 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-platform-plugins-settings' build-node: centos7-redis-4c-4g + +- project: + name: ccsdk-platform-plugins-info + project-name: ccsdk-platform-plugins + jobs: + - gerrit-info-yaml-verify + project: ccsdk/platform/plugins + branch: master diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index b880dcc0f..1b3237f98 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -5,14 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/sli/adaptors' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-adaptors-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 @@ -48,6 +53,16 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-adaptors-settings' build-node: ubuntu1604-builder-4c-4g + +- project: + name: ccsdk-sli-adaptors-info + project-name: ccsdk-sli-adaptors + jobs: + - gerrit-info-yaml-verify + project: ccsdk/sli/adaptors + branch: master diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index fee7df8ad..a3feadd15 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -5,14 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/sli/core' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-core-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 @@ -48,6 +53,16 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-core-settings' build-node: ubuntu1604-builder-4c-4g + +- project: + name: ccsdk-sli-core-info + project-name: ccsdk-sli-core + jobs: + - gerrit-info-yaml-verify + project: ccsdk/sli/core + branch: master diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 5c85642f6..66c753b0b 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -5,14 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/sli/northbound' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-northbound-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 @@ -48,6 +53,16 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-northbound-settings' build-node: ubuntu1604-builder-4c-4g + +- project: + name: ccsdk-sli-northbound-info + project-name: ccsdk-sli-northbound + jobs: + - gerrit-info-yaml-verify + project: ccsdk/sli/northbound + branch: master diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 27f06c9fc..290cb9b90 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -5,14 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/sli/plugins' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-plugins-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 @@ -47,5 +52,15 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-plugins-settings' + +- project: + name: ccsdk-sli-plugins-info + project-name: ccsdk-sli-plugins + jobs: + - gerrit-info-yaml-verify + project: ccsdk/sli/plugins + branch: master diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index b0b011f07..5c5e31633 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -5,14 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/utils' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-utils-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 @@ -34,5 +39,15 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-utils-settings' + +- project: + name: ccsdk-utils-info + project-name: ccsdk-utils + jobs: + - gerrit-info-yaml-verify + project: ccsdk/utils + branch: master diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index d812804f7..081392c0d 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -14,10 +14,8 @@ platforms: - centos-7 - - centos-7-arm64 - ubuntu-16.04 - ubuntu-16.04-arm64 - - ubuntu-18.04-arm64 templates: builder - project: @@ -34,9 +32,9 @@ build-timeout: 90 platforms: + - centos-7 - ubuntu-16.04 - ubuntu-16.04-arm64 - - ubuntu-18.04-arm64 templates: docker - project: diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml new file mode 100644 index 000000000..8915a2caa --- /dev/null +++ b/jjb/ci-management/ci-management-views.yaml @@ -0,0 +1,121 @@ +--- +- releng_view: &releng_view_common + name: releng-view-common + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - jacoco + - find-bugs + - robot-list + recurse: false + +- project: + name: '00-Empty View' + views: + - common-view + view-name: '00-Empty View' + view-description: > + Empty job view. This is used as the default landing view to keep the + Jenkins UI responding better while a) under high load and b) when there + are a lot of jobs defined in the system + view-regex: '' + +- view: + name: 01-Recent + regex: '.*' + description: 'List of most recent jobs' + job-filters: + most-recent: + max-to-include: 25 + check-start-time: true + <<: *releng_view_common + +- project: + name: All-Sonar + views: + - common-view + view-name: All-Sonar + view-regex: '^(?=.*-sonar)(?!.*-no-sonar).*' + view-description: 'List of Sonar jobs' + +- view: + name: CLM + description: 'List of CLM jobs' + regex: '.*-clm-.*' + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - policy-violations + recurse: false + +- project: + name: CSIT + views: + - csit-view + view-name: CSIT + view-description: 'List of CSIT jobs' + view-regex: '^.*-csit-.*' + +- project: + name: CSIT-Verify + views: + - csit-view + view-name: CSIT-Verify + view-description: 'List of CSIT Verify jobs' + view-regex: '^.*-verify-csit.*' + +- view: + name: Daily-Jobs + views: + - common-view + view-name: Daily-Jobs + view-description: 'List of Daily Jobs' + view-regex: '.*-daily' + +- view: + name: External-Labs + views: + - common-view + view-name: External-Labs + view-description: 'List of External Labs jobs' + view-regex: '^lab-.*' + +- project: + name: Merge-Jobs + views: + - common-view + view-name: Merge-Jobs + view-description: 'List of Merge jobs' + view-regex: '.*-merge-.*' + +- project: + name: Thirdparty + views: + - common-view + view-name: Thirdparty + view-description: 'List of Nexus Thirdparty dependencies jobs' + view-regex: '.*-thirdparty-.*' + +- project: + name: Verify-Jobs + views: + - common-view + view-name: Verify-Jobs + view-description: 'List of Verify jobs' + view-regex: '^.*-verify-.*' diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 5c90a17ee..b31cffac3 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -18,3 +18,17 @@ build-timeout: '60' build-node: 'centos7-builder-2c-1g' jjb-version: 2.9.1 + +- project: + name: builder-openstack + jobs: + - gerrit-openstack-cron + + project: ci-management + project-name: ci-management + build-node: centos7-builder-2c-1g + + jenkins-urls: > + https://jenkins.onap.org + https://jenkins.onap.org/sandbox + openstack-cloud: vex diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index 5a81ffa8b..d069aa59f 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -5,11 +5,14 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'clamp' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'APIs': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - 'UIs': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' - branch: 'master' diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index 3a48588b2..15095463f 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -33,8 +33,10 @@ project: 'clamp' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'clamp-settings' files: '**' archive-artifacts: '' @@ -66,3 +68,11 @@ mvn-settings: 'clamp-settings' build-node: ubuntu1604-docker-8c-8g build-timeout: 120 + +- project: + name: clamp-info + project-name: clamp + jobs: + - gerrit-info-yaml-verify + project: clamp + branch: master diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index b2cefd290..418ca6559 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -27,24 +27,24 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: cli-arm64 - project-name: 'cli-arm64' - jobs: - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'deployment/docker/pom.xml' - mvn-goals: 'docker:build' - docker-image-name: 'onap/cli' - - project: 'cli' - stream: - - 'master': - branch: 'master' - mvn-settings: 'cli-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: cli-arm64 +# project-name: 'cli-arm64' +# jobs: +# - '{project-name}-{stream}-aai-docker-java-daily': +# pom: 'deployment/docker/pom.xml' +# mvn-goals: 'docker:build' +# docker-image-name: 'onap/cli' +# +# project: 'cli' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'cli-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: cli-sonar jobs: @@ -68,3 +68,11 @@ branch: 'master' mvn-settings: 'cli-settings' build-node: ubuntu1604-builder-4c-4g + +- project: + name: cli-info + project-name: cli + jobs: + - gerrit-info-yaml-verify + project: cli + branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index 4676ca9e9..f5d60d892 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -13,7 +13,8 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: 'ubuntu1604-docker-v1-8c-8g' + build-timeout: 300 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -41,3 +42,11 @@ project-name: 'dcaegen2-analytics-pnda' branch: 'master' mvn-settings: 'dcaegen2-analytics-pnda-settings' + +- project: + name: dcaegen2-analytics-pnda-info + project-name: dcaegen2-analytics-pnda + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/analytics/pnda + branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 30365ca9c..6d0d2dcb4 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -47,3 +47,11 @@ project-name: 'dcaegen2-analytics-tca-gen2' branch: 'master' mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' + +- project: + name: dcaegen2-analytics-tca-gen2-info + project-name: dcaegen2-analytics-tca-gen2 + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/analytics/tca-gen2 + branch: master diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml similarity index 85% rename from jjb/dcaegen2/apod-analytics.yaml rename to jjb/dcaegen2/dcaegen2-analytics-tca.yaml index acd46863b..d32d4b91f 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml @@ -7,7 +7,8 @@ stream: - 'master': branch: 'master' - + - 'dublin': + branch: 'dublin' # apply to all jobs project: 'dcaegen2/analytics/tca' mvn-settings: 'dcaegen2-analytics-tca-settings' @@ -46,3 +47,11 @@ branch: 'master' build-node: ubuntu1604-builder-4c-4g mvn-settings: 'dcaegen2-analytics-tca-settings' + +- project: + name: dcaegen2-analytics-tca-info + project-name: dcaegen2-analytics-tca + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/analytics/tca + branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml new file mode 100644 index 000000000..6740daefc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml @@ -0,0 +1,20 @@ +- project: + name: dcaegen2-collectors-datafile-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-collectors-datafile' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + functionality: + - 'ManagementInterface-suite': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' + - 'Functional-suite': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' + robot-options: '' + branch: 'master' \ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index bd28fb3cf..7f065240c 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' # apply to all jobs project: 'dcaegen2/collectors/datafile' mvn-settings: 'dcaegen2-collectors-datafile-settings' @@ -46,3 +46,11 @@ project-name: 'dcaegen2-collectors-datafile' branch: 'master' mvn-settings: 'dcaegen2-collectors-datafile-settings' + +- project: + name: dcaegen2-collectors-datafile-info + project-name: dcaegen2-collectors-datafile + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/collectors/datafile + branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml index 128a50e3f..710850355 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml @@ -7,8 +7,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'testsuites': trigger_jobs: diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 81f5b599e..3a574a504 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' # apply to all jobs project: 'dcaegen2/collectors/hv-ves' mvn-settings: 'dcaegen2-collectors-hv-ves-settings' @@ -37,3 +37,11 @@ branch: 'master' build-node: ubuntu1604-docker-8c-8g mvn-settings: 'dcaegen2-collectors-hv-ves-settings' + +- project: + name: dcaegen2-collectors-hv-ves-info + project-name: dcaegen2-collectors-hv-ves + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/collectors/hv-ves + branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml new file mode 100644 index 000000000..5720a64dc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml @@ -0,0 +1,14 @@ +- project: + name: dcaegen2-collectors-restconf-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-collectors-restconf' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 4a704fb2d..1be57266b 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-collectors-restconf-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -44,3 +46,11 @@ project-name: 'dcaegen2-collectors-restconf' branch: 'master' mvn-settings: 'dcaegen2-collectors-restconf-settings' + +- project: + name: dcaegen2-collectors-restconf-info + project-name: dcaegen2-collectors-restconf + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/collectors/restconf + branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index c002f3eb0..79dab04c5 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-collectors-snmptrap-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -46,3 +46,11 @@ project-name: 'dcaegen2-collectors-snmptrap' branch: 'master' mvn-settings: 'dcaegen2-collectors-snmptrap-settings' + +- project: + name: dcaegen2-collectors-snmptrap-info + project-name: dcaegen2-collectors-snmptrap + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/collectors/snmptrap + branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index e84fb5988..d7bc96472 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-collectors-ves-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -46,3 +46,11 @@ project-name: 'dcaegen2-collectors-ves' branch: 'master' mvn-settings: 'dcaegen2-collectors-ves-settings' + +- project: + name: dcaegen2-collectors-ves-info + project-name: dcaegen2-collectors-ves + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/collectors/ves + branch: master diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index dad7e8b67..5dee64645 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-deployments-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -21,7 +21,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1604-docker-v1-8c-8g' build-timeout: 180 - project: @@ -34,3 +34,11 @@ project-name: 'dcaegen2-deployments' branch: 'master' mvn-settings: 'dcaegen2-deployments-settings' + +- project: + name: dcaegen2-deployments-info + project-name: dcaegen2-deployments + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/deployments + branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 9eefd6667..285d4e0ee 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-platform-blueprints-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -33,3 +33,11 @@ project-name: 'dcaegen2-platform-blueprints' branch: 'master' mvn-settings: 'dcaegen2-platform-blueprints-settings' + +- project: + name: dcaegen2-platform-blueprints-info + project-name: dcaegen2-platform-blueprints + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/platform/blueprints + branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml deleted file mode 100644 index 64849c331..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: dcaegen2-platform-cdapbroker - project-name: 'dcaegen2-platform-cdapbroker' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'dcaegen2/platform/cdapbroker' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-platform-cdapbroker-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: '' - build-node: 'ubuntu1604-docker-8c-8g' - -- project: - name: dcaegen2-platform-cdapbroker-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/cdapbroker - build-node: ubuntu1604-docker-8c-8g - project-name: 'dcaegen2-platform-cdapbroker' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cdapbroker-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml new file mode 100644 index 000000000..86759fe64 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml @@ -0,0 +1,23 @@ +--- +- project: + name: dcaegen2-platform-cli-bp-gen + project: 'dcaegen2/platform/cli' + project-name: 'dcaegen2-platform-cli' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily': + version-properties: 'blueprint-generator/version.properties' + subproject: + - 'blueprint-gen': + pom: 'blueprint-generator/pom.xml' + pattern: 'blueprint-generator/**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-cli-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 1b9e5c272..213022373 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -44,3 +44,11 @@ project-name: 'dcaegen2-platform-cli' branch: 'master' mvn-settings: 'dcaegen2-platform-cli-settings' + +- project: + name: dcaegen2-platform-cli-info + project-name: dcaegen2-platform-cli + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/platform/cli + branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 2e4199e08..8f753b4a3 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-platform-configbinding-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -46,3 +46,11 @@ project-name: 'dcaegen2-platform-configbinding' branch: 'master' mvn-settings: 'dcaegen2-platform-configbinding-settings' + +- project: + name: dcaegen2-platform-configbinding-info + project-name: dcaegen2-platform-configbinding + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/platform/configbinding + branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 4bdcb9cc2..b6bb261d6 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-platform-deployment-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -33,3 +33,11 @@ project-name: 'dcaegen2-platform-deployment-handler' branch: 'master' mvn-settings: 'dcaegen2-platform-deployment-handler-settings' + +- project: + name: dcaegen2-platform-deployment-handler-info + project-name: dcaegen2-platform-deployment-handler + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/platform/deployment-handler + branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index e2041db7b..d33b745b0 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -16,8 +16,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-platform-inventory-api-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -51,3 +51,11 @@ project-name: 'dcaegen2-platform-inventory-api' branch: 'master' mvn-settings: 'dcaegen2-platform-inventory-api-settings' + +- project: + name: dcaegen2-platform-inventory-api-info + project-name: dcaegen2-platform-inventory-api + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/platform/inventory-api + branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 9153531ec..3909a2342 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-platform-plugins-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -46,3 +46,11 @@ project-name: 'dcaegen2-platform-plugins' branch: 'master' mvn-settings: 'dcaegen2-platform-plugins-settings' + +- project: + name: dcaegen2-platform-plugins-info + project-name: dcaegen2-platform-plugins + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/platform/plugins + branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 258bb4744..cb19425a6 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-platform-policy-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -46,3 +46,11 @@ project-name: 'dcaegen2-platform-policy-handler' branch: 'master' mvn-settings: 'dcaegen2-platform-policy-handler-settings' + +- project: + name: dcaegen2-platform-policy-handler-info + project-name: dcaegen2-platform-policy-handler + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/platform/policy-handler + branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index e46df4e5e..a91af7a9b 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -38,3 +36,11 @@ project-name: 'dcaegen2-platform-servicechange-handler' branch: 'master' mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' + +- project: + name: dcaegen2-platform-servicechange-handler-info + project-name: dcaegen2-platform-servicechange-handler + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/platform/servicechange-handler + branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml new file mode 100644 index 000000000..94e7e2e1a --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml @@ -0,0 +1,16 @@ +- project: + name: dcaegen2-bbs-event-processor-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-services-bbs-event-processor' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + functionality: + - 'bbs-testsuites': + trigger_jobs: + - 'dcaegen2-services-{stream}-bbs-event-processor-merge-java' + robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml new file mode 100644 index 000000000..2e49ee55a --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -0,0 +1,51 @@ +--- +- project: + name: dcaegen2-services-bbs-event-processor + project: 'dcaegen2/services' + project-name: 'dcaegen2-services' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily': + version-properties: 'components/bbs-event-processor/version.properties' + subproject: + - 'bbs-event-processor': + pom: 'components/bbs-event-processor/pom.xml' + pattern: 'components/bbs-event-processor/**' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'dcaegen2-services-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-services-bbs-event-processor-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-bbs-event-processor' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + mvn-params: '-f components/bbs-event-processor/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-bbs-event-processor-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-bbs-event-processor-clm' + mvn-params: '-f components/bbs-event-processor/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml new file mode 100644 index 000000000..1c5ad804f --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -0,0 +1,37 @@ +--- +- project: + name: dcaegen2-services-datalake-handler + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily': + version-properties: 'components/datalake-handler/version.properties' + subproject: + - 'datalake-handler': + pom: 'components/datalake-handler/pom.xml' + pattern: 'components/datalake-handler/**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-services-datalake-handler-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + mvn-params: '-f components/datalake-handler/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 3c08887be..3527ffd87 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-services-heartbeat-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -44,3 +46,11 @@ project-name: 'dcaegen2-services-heartbeat' branch: 'master' mvn-settings: 'dcaegen2-services-heartbeat-settings' + +- project: + name: dcaegen2-services-heartbeat-info + project-name: dcaegen2-services-heartbeat + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/services/heartbeat + branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-java.yaml b/jjb/dcaegen2/dcaegen2-services-java.yaml new file mode 100644 index 000000000..dc0475994 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-java.yaml @@ -0,0 +1,11 @@ +--- +- project: + name: dcaegen2-services-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1604-docker-4c-4g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 1ff1adbe7..e319e68a6 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-services-mapper-settings' files: '**' archive-artifacts: '' @@ -45,3 +47,11 @@ project-name: 'dcaegen2-services-mapper' branch: 'master' mvn-settings: 'dcaegen2-services-mapper-settings' + +- project: + name: dcaegen2-services-mapper-info + project-name: dcaegen2-services-mapper + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/services/mapper + branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 748dfb016..0d6687f8b 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' @@ -21,7 +23,7 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean install dockerfile:build dockerfile:push' + mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version' script: '/bin/true' - project: @@ -47,3 +49,11 @@ project-name: 'dcaegen2-services-pm-mapper' branch: 'master' mvn-settings: 'dcaegen2-services-pm-mapper-settings' + +- project: + name: dcaegen2-services-pm-mapper-info + project-name: dcaegen2-services-pm-mapper + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/services/pm-mapper + branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml new file mode 100644 index 000000000..1d4bcf2e5 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml @@ -0,0 +1,18 @@ +- project: + name: dcae-bulkpm-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-pmmapper' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + + functionality: + - 'pmmapper': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 344ee5363..8e3047f7e 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-services-prh-settings' files: '**' archive-artifacts: '' @@ -43,3 +43,11 @@ project-name: 'dcaegen2-services-prh' branch: 'master' mvn-settings: 'dcaegen2-services-prh-settings' + +- project: + name: dcaegen2-services-prh-info + project-name: dcaegen2-services-prh + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/services/prh + branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 16a93cd05..2c12df9f1 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-services-sdk-settings' files: '**' archive-artifacts: '' @@ -41,3 +43,11 @@ project-name: 'dcaegen2-services-sdk' branch: 'master' mvn-settings: 'dcaegen2-services-sdk-settings' + +- project: + name: dcaegen2-services-sdk-info + project-name: dcaegen2-services-sdk + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/services/sdk + branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml new file mode 100644 index 000000000..b4d2b5c5b --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -0,0 +1,53 @@ +--- +- project: + name: dcaegen2-services-son-handler + project-name: 'dcaegen2-services-son-handler' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/services/son-handler' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'dcaegen2-services-son-handler-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-son-handler-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/services/son-handler' + project-name: 'dcaegen2-services-son-handler' + branch: 'master' + mvn-settings: 'dcaegen2-services-son-handler-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-son-handler-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/services/son-handler + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-son-handler' + branch: 'master' + mvn-settings: 'dcaegen2-services-son-handler-settings' + +- project: + name: dcaegen2-services-son-handler-info + project-name: dcaegen2-services-son-handler + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/services/son-handler + branch: master diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index f817e4f6f..d91b3789c 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -13,8 +13,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-utils-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -48,3 +48,11 @@ project-name: 'dcaegen2-utils' branch: 'master' mvn-settings: 'dcaegen2-utils-settings' + +- project: + name: dcaegen2-utils-info + project-name: dcaegen2-utils + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/utils + branch: master diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml similarity index 72% rename from jjb/dcaegen2/dcaegen2-csit.yaml rename to jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml index 6962c6287..4c610e167 100644 --- a/jjb/dcaegen2/dcaegen2-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml @@ -1,5 +1,5 @@ - project: - name: dcaegen2-testsuites-csit + name: dcaegen2-collectors-ves-testsuites-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' @@ -7,12 +7,11 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'testsuites' trigger_jobs: - - 'dcaegen2-master-merge-java' - 'dcaegen2-collectors-ves-master-merge-java' robot-options: '' - project: @@ -24,11 +23,10 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'prh-testsuites' trigger_jobs: - - 'dcaegen2-{stream}-merge-java' - - '{project-name}-{stream}-merge-java' + - 'dcaegen2-services-prh-master-merge-java' robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 17d372e23..9987f577c 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -17,8 +17,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'dcaegen2-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -37,3 +35,11 @@ project-name: 'dcaegen2' branch: 'master' mvn-settings: 'dcaegen2-settings' + +- project: + name: dcaegen2-info + project-name: dcaegen2 + jobs: + - gerrit-info-yaml-verify + project: dcaegen2 + branch: master diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index bf7f87f10..d86624790 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -11,14 +11,17 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'demo' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'demo-settings' files: '**' archive-artifacts: '' @@ -35,3 +38,11 @@ mvn-settings: 'demo-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: demo-info + project-name: demo + jobs: + - gerrit-info-yaml-verify + project: demo + branch: master diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 1929eb0d0..2420436b6 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -17,7 +17,7 @@ # - '{project-name}-{stream}-docker-java-daily': # doesn't support mvn-goals override, so trying this... - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean package -P docker docker:build -DpushImage' + mvn-goals: 'clean package -P docker docker:build docker:push' # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' @@ -43,3 +43,11 @@ project-name: 'dmaap-buscontroller' branch: 'master' mvn-settings: 'dmaap-buscontroller-settings' + +- project: + name: dmaap-buscontroller-info + project-name: dmaap-buscontroller + jobs: + - gerrit-info-yaml-verify + project: dmaap/buscontroller + branch: master diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml index 3a54b4263..e1cabcfb1 100644 --- a/jjb/dmaap/dmaap-datarouter-csit.yaml +++ b/jjb/dmaap/dmaap-datarouter-csit.yaml @@ -14,6 +14,18 @@ - 'dr-suite': trigger_jobs: - '{project-name}-{stream}-docker-java-shell-daily' + robot-options: '' + +- project: + name: dmaap-datarouter-csit-ssl + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dmaap-datarouter' + stream: + - 'master': + branch: 'master' + functionality: - 'ssl-dr-suite': trigger_jobs: - '{project-name}-{stream}-docker-java-shell-daily' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index e75defd5c..ac8aade16 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -10,7 +10,7 @@ # - '{project-name}-{stream}-docker-java-daily': # doesn't support mvn-goals override, so trying this... - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean package -P docker docker:build -DpushImage' + mvn-goals: 'clean package -P docker docker:build docker:push' # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' @@ -19,6 +19,29 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-datarouter-settings' + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-datarouter-casablanca + project-name: 'dmaap-datarouter' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + # + # see DMAAP-334 for more details, but + # - '{project-name}-{stream}-docker-java-daily': + # doesn't support mvn-goals override, so trying this... + - '{project-name}-{stream}-docker-java-shell-daily': + mvn-goals: 'clean package -P docker docker:build -DpushImage' + # No-op + script: '/bin/true' + build-node: 'ubuntu1604-docker-8c-8g' + + project: 'dmaap/datarouter' + stream: - 'casablanca': branch: 'casablanca' mvn-settings: 'dmaap-datarouter-settings' @@ -47,3 +70,11 @@ project-name: 'dmaap-datarouter' branch: 'master' mvn-settings: 'dmaap-datarouter-settings' + +- project: + name: dmaap-datarouter-info + project-name: dmaap-datarouter + jobs: + - gerrit-info-yaml-verify + project: dmaap/datarouter + branch: master diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 131a47bfe..5fd25b992 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -41,3 +41,11 @@ project-name: 'dmaap-dbcapi' branch: 'master' mvn-settings: 'dmaap-dbcapi-settings' + +- project: + name: dmaap-dbcapi-info + project-name: dmaap-dbcapi + jobs: + - gerrit-info-yaml-verify + project: dmaap/dbcapi + branch: master diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml index 39202f272..b6a9ac75c 100644 --- a/jjb/dmaap/dmaap-kafka-docker.yaml +++ b/jjb/dmaap/dmaap-kafka-docker.yaml @@ -18,3 +18,11 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' build-node: ubuntu1604-docker-8c-8g + +- project: + name: dmaap-kafka-docker-info + project-name: dmaap-kafka-docker + jobs: + - gerrit-info-yaml-verify + project: dmaap/kafka11aaf + branch: master diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml index 088b13085..7b1573ce3 100644 --- a/jjb/dmaap/dmaap-kafka.yaml +++ b/jjb/dmaap/dmaap-kafka.yaml @@ -23,3 +23,11 @@ mvn-settings: 'dmaap-kafka11aaf-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dmaap-kafka-info + project-name: dmaap-kafka + jobs: + - gerrit-info-yaml-verify + project: dmaap/kafka11aaf + branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 60cc6ec33..b5db723bc 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -36,3 +36,11 @@ project-name: 'dmaap-messagerouter-dmaapclient' branch: 'master' mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' + +- project: + name: dmaap-messagerouter-dmaapclient-info + project-name: dmaap-messagerouter-dmaapclient + jobs: + - gerrit-info-yaml-verify + project: dmaap/messagerouter/dmaapclient + branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index d6d12b3e0..f2cf27a2b 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -29,3 +29,11 @@ build-node: ubuntu1604-docker-8c-8g branch: 'master' mvn-settings: 'dmaap-messagerouter-messageservice-settings' + +- project: + name: dmaap-messagerouter-docker-info + project-name: dmaap-messagerouter-docker + jobs: + - gerrit-info-yaml-verify + project: dmaap/messagerouter/messageservice + branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index d3b9e2922..828c1af93 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -36,3 +36,11 @@ project-name: 'dmaap-messagerouter-messageservice' branch: 'master' mvn-settings: 'dmaap-messagerouter-messageservice-settings' + +- project: + name: dmaap-messagerouter-messageservice-info + project-name: dmaap-messagerouter-messageservice + jobs: + - gerrit-info-yaml-verify + project: dmaap/messagerouter/messageservice + branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index c6df58870..91cde72e6 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -36,3 +36,11 @@ project-name: 'dmaap-messagerouter-mirroragent' branch: 'master' mvn-settings: 'dmaap-messagerouter-mirroragent-settings' + +- project: + name: dmaap-messagerouter-mirroragent-info + project-name: dmaap-messagerouter-mirroragent + jobs: + - gerrit-info-yaml-verify + project: dmaap/messagerouter/mirroragent + branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 5789d12e8..ba2642841 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -36,3 +36,11 @@ project-name: 'dmaap-messagerouter-msgrtr' branch: 'master' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' + +- project: + name: dmaap-messagerouter-msgrtr-info + project-name: dmaap-messagerouter-msgrtr + jobs: + - gerrit-info-yaml-verify + project: dmaap/messagerouter/msgrtr + branch: master diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml index 8d5dfe3d8..de9855ca3 100644 --- a/jjb/dmaap/dmaap-zookeeper.yaml +++ b/jjb/dmaap/dmaap-zookeeper.yaml @@ -28,3 +28,11 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' build-node: ubuntu1604-docker-8c-8g + +- project: + name: dmaap-zookeeper-info + project-name: dmaap-zookeeper + jobs: + - gerrit-info-yaml-verify + project: dmaap/zookeeper + branch: master diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 8515d7378..5ae9f730b 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -10,7 +10,7 @@ project-name: 'doc' jobs: - '{project-name}-{stream}-verify-rtd': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - '{project-name}-{stream}-merge-rtd' project: 'doc' @@ -25,3 +25,13 @@ branch: 'beijing' - casablanca: branch: 'casablanca' + - dublin: + branch: 'dublin' + +- project: + name: doc-info + project-name: doc + jobs: + - gerrit-info-yaml-verify + project: doc + branch: master diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index bdd15418d..66e40e59c 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -11,6 +11,13 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' @@ -21,8 +28,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' files: '**' archive-artifacts: '' @@ -55,8 +60,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' - project: @@ -67,7 +70,15 @@ build-node: ubuntu1604-builder-4c-4g project: 'externalapi/nbi' project-name: 'externalapi-nbi' - branch: 'casablanca' + branch: 'master' mvn-settings: 'externalapi-nbi-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: externalapi-nbi-info + project-name: externalapi-nbi + jobs: + - gerrit-info-yaml-verify + project: externalapi/nbi + branch: master diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index e43a8a29f..b86e65374 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -47,6 +47,7 @@ # git submodule attributes submodule-recursive: true + submodule-disable: false # Jenkins jenkins-ssh-credential: onap-jenkins-ssh diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index b7a56afb1..c78301521 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -486,6 +486,15 @@ Golang 1.11 +- wrapper: + name: golang112 + wrappers: + - raw: + xml: | + + Golang 1.12 + + - wrapper: # This wrapper is required for all jobs as it configures the wrappers # needed by the eCOMP infra. diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index 9f9bdf9f1..40c517063 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -1,40 +1,71 @@ --- -# vim: sw=2 ts=2 sts=2 et : +#################### +# COMMON FUNCTIONS # +#################### -- job-template: - # - # job template for build C/C++ project - # - # Required Variables: - # script: build script to execute - # +- c_job_common: &c_job_common + name: c-job-common + + ###################### + # Default parameters # + ###################### + + branch: master + submodule-recursive: true + submodule-disable: false + submodule-timeout: 10 + + ##################### + # Job Configuration # + ##################### - name: '{project-name}-{stream}-verify-c' project-type: freestyle node: '{build-node}' + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' parameters: - - infra-parameters: + - lf-infra-parameters: project: '{project}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' + stream: '{stream}' scm: - - gerrit-trigger-scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '$GIT_URL/$PROJECT' refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' + submodule-disable: '{submodule-disable}' + submodule-timeout: '{submodule-timeout}' + choosing-strategy: default wrappers: - - infra-wrappers: + - lf-infra-wrappers: build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + publishers: + - lf-infra-publish + +################# +# JOB TEMPLATES # +################# + +- job-template: + # + # job template for build C/C++ project + # + # Required Variables: + # script: build script to execute + # + name: '{project-name}-{stream}-verify-c' + id: gerrit-verify-c + <<: *c_job_common triggers: - gerrit-trigger-patch-submitted: @@ -47,11 +78,6 @@ - lf-infra-pre-build - shell: '{script}' - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - - - job-template: # Job template for building & pushing docker images # @@ -59,31 +85,10 @@ # 1. login to the docker registry # 2. run a specified shell builder # - name: '{project-name}-{stream}-docker-c-shell-daily' - project-type: freestyle + id: gerrit-docker-c-shell-daily + <<: *c_job_common node: 'ubuntu1604-docker-8c-8g' - disabled: false - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' triggers: # 12 AM UTC @@ -100,7 +105,3 @@ settings-file: '{mvn-settings}' - docker-login - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index db3d4cfc7..1c8242f32 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -24,6 +24,7 @@ # Default to LF standard 'snapshots' docker registry docker_registry: '$DOCKER_REGISTRY:10003' docker_tag: 'latest' + submodule-disable: false submodule-timeout: 10 ##################### @@ -280,6 +281,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -340,6 +342,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -560,6 +563,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -620,6 +624,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -677,6 +682,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -729,6 +735,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 6c139ddb8..12ce9a383 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -13,9 +13,12 @@ submodule-recursive: true # default params for helm jobs - pre_build_script: '' build_script: '' + git-url: '$GIT_URL/$PROJECT' post_build_script: '' + pre_build_script: '' + submodule-disable: false + submodule-recursive: true submodule-timeout: 10 ##################### @@ -106,6 +109,94 @@ - shell: '{obj:post_build_script}' - lf-provide-maven-settings-cleanup +- job-template: + name: '{project-name}-{stream}-verify-external-helm' + # Job template for helm verify jobs + + <<: *helm_job_boiler_plate + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: 'oom' + stream: '{stream}' + lftools-version: '{lftools-version}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' + refspec: '$GERRIT_BRANCH' + branch: '$GERRIT_BRANCH' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' + choosing-strategy: default + + triggers: + - gerrit-trigger-helm-patch-submitted: + status-context: '{project}-Helm-Verify' + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{files}' + + builders: + - lf-infra-pre-build + - inject: + properties-content: 'HELM_MODULE={helm-module}' + - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh + - shell: '{obj:pre_build_script}' + - shell: '{obj:build_script}' + +- job-template: + name: '{project-name}-{stream}-merge-external-helm' + # Job template for Helm merge jobs + + <<: *helm_job_boiler_plate + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: 'oom' + stream: '{stream}' + lftools-version: '{lftools-version}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' + refspec: '$GERRIT_BRANCH' + branch: '$GERRIT_BRANCH' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' + choosing-strategy: default + + triggers: + - gerrit-trigger-helm-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{files}' + + builders: + - lf-infra-pre-build + - inject: + properties-content: 'HELM_MODULE={helm-module}' + - lf-provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - shell: '{obj:pre_build_script}' + - shell: '{obj:build_script}' + - lf-infra-create-netrc: + server-id: oom-helm + - inject: + properties-content: | + BUILD_TYPE=snapshot + - shell: '{obj:post_build_script}' + - lf-provide-maven-settings-cleanup + - job-template: name: '{project-name}-{stream}-stage-helm' # Job template for Helm stage jobs @@ -184,6 +275,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 70d8c097e..c7fe3cf80 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -490,6 +490,7 @@ project-type: freestyle node: '{build-node}' disabled: '{disabled}' + version-properties: 'version.properties' maven-deploy-properties: properties: - infra-properties: @@ -529,7 +530,7 @@ settings-file: '{mvn-settings}' - inject: - properties-file: version.properties + properties-file: '{version-properties}' - maven-set-release-version: maven-version: '{maven-version}' mvn-settings: '{mvn-settings}' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index fe37740b6..11b90aeda 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'holmes/common' stream: @@ -44,3 +47,11 @@ project-name: 'holmes-common' branch: 'master' mvn-settings: 'holmes-common-settings' + +- project: + name: holmes-common-info + project-name: holmes-common + jobs: + - gerrit-info-yaml-verify + project: holmes/common + branch: master diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml deleted file mode 100644 index 82e03fe04..000000000 --- a/jjb/holmes/holmes-dsa.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: holmes-dsa - project-name: 'holmes-dsa' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g - project: 'holmes/dsa' - stream: - - 'master': - branch: 'master' - mvn-settings: 'holmes-dsa-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g - -- project: - name: holmes-dsa-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'holmes/dsa' - project-name: 'holmes-dsa' - branch: 'master' - mvn-settings: 'holmes-dsa-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: holmes-dsa-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: holmes/dsa - project-name: 'holmes-dsa' - branch: 'master' - mvn-settings: 'holmes-dsa-settings' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index fb36947be..0279d4ed7 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g @@ -42,3 +45,11 @@ project-name: 'holmes-engine-management' branch: 'master' mvn-settings: 'holmes-engine-management-settings' + +- project: + name: holmes-engine-management-info + project-name: holmes-engine-management + jobs: + - gerrit-info-yaml-verify + project: holmes/engine-management + branch: master diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 42f82ba43..df2671064 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g @@ -42,3 +45,11 @@ project-name: 'holmes-rule-management' branch: 'master' mvn-settings: 'holmes-rule-management-settings' + +- project: + name: holmes-rule-management-info + project-name: holmes-rule-management + jobs: + - gerrit-info-yaml-verify + project: holmes/rule-management + branch: master diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml index 70804c45d..a7fe91608 100644 --- a/jjb/integration/integration-csit.yaml +++ b/jjb/integration/integration-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' functionality: - 'functionality1': trigger_jobs: diff --git a/jjb/integration/integration-devtool.yaml b/jjb/integration/integration-devtool.yaml index 175dffa5a..b656b4fbd 100644 --- a/jjb/integration/integration-devtool.yaml +++ b/jjb/integration/integration-devtool.yaml @@ -14,3 +14,11 @@ branch: 'master' mvn-settings: 'integration-devtool-settings' build-node: ubuntu1604-builder-2c-1g + +- project: + name: integration-devtool-info + project-name: integration-devtool + jobs: + - gerrit-info-yaml-verify + project: integration/devtool + branch: master diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index 6bdf2885f..8fea30f4b 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -9,8 +9,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' subproject: - 'sniroemulator': pom: 'test/mocks/sniroemulator/pom.xml' diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index cb253c666..714878e4a 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -11,7 +11,12 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'version-manifest/pom.xml' + mvn-params: '-f version-manifest/pom.xml' project: 'integration' subproject: - 'version-manifest': @@ -20,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' @@ -38,6 +41,12 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'integration-settings' + +- project: + name: integration-info + project-name: integration + jobs: + - gerrit-info-yaml-verify + project: integration + branch: master diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml index c5b69ba8e..2dd843fb9 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml @@ -5,6 +5,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' @@ -24,25 +28,25 @@ build-node: ubuntu1604-builder-4c-4g maven-version: 'mvn35' -- project: - name: logging-analytics-pomba-pomba-arm64-aai-context-builder - project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder - jobs: - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: logging-analytics/pomba/pomba-aai-context-builder - stream: - - 'master': - branch: 'master' - - mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - maven-version: 'mvn35' - +#- project: +# name: logging-analytics-pomba-pomba-arm64-aai-context-builder +# project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder +# jobs: +# - '{project-name}-{stream}-docker-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: logging-analytics/pomba/pomba-aai-context-builder +# stream: +# - 'master': +# branch: 'master' +# +# mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# maven-version: 'mvn35' +# - project: name: logging-analytics-pomba-pomba-aai-context-builder-sonar jobs: diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml index 43c4afced..2fbfff6f5 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml @@ -5,6 +5,10 @@ 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-name}-{stream}-release-version-java-daily' project: logging-analytics/pomba/pomba-audit-common stream: diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml index 6f2238aed..091b9a445 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml @@ -5,6 +5,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml index ad3af90d1..f41625f5d 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml @@ -5,6 +5,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' @@ -23,26 +27,26 @@ build-node: ubuntu1604-builder-4c-4g maven-version: 'mvn35' -- project: - name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder - project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder - jobs: - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: logging-analytics/pomba/pomba-network-discovery-context-builder - stream: - - 'master': - branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - maven-version: 'mvn35' - +#- project: +# name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder +# project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder +# jobs: +# - '{project-name}-{stream}-docker-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: logging-analytics/pomba/pomba-network-discovery-context-builder +# stream: +# - 'master': +# branch: 'master' +# - 'casablanca': +# branch: 'casablanca' +# mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# maven-version: 'mvn35' +# - project: name: logging-analytics-pomba-pomba-network-discovery-context-builder-sonar jobs: diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml index 685b4c6ca..5bc97bb88 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml @@ -5,6 +5,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' @@ -23,24 +27,24 @@ build-node: ubuntu1604-builder-4c-4g maven-version: 'mvn35' -- project: - name: logging-analytics-pomba-pomba-arm64-sdc-context-builder - project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder - jobs: - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: logging-analytics/pomba/pomba-sdc-context-builder - stream: - - 'master': - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - maven-version: 'mvn35' - +#- project: +# name: logging-analytics-pomba-pomba-arm64-sdc-context-builder +# project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder +# jobs: +# - '{project-name}-{stream}-docker-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: logging-analytics/pomba/pomba-sdc-context-builder +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# maven-version: 'mvn35' +# - project: name: logging-analytics-pomba-pomba-sdc-context-builder-sonar jobs: diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml index 3525bb073..cd1d05c6b 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml @@ -5,6 +5,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' @@ -22,23 +26,23 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder - project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder - jobs: - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: logging-analytics/pomba/pomba-sdnc-context-builder - stream: - - 'master': - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder +# project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder +# jobs: +# - '{project-name}-{stream}-docker-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: logging-analytics/pomba/pomba-sdnc-context-builder +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar jobs: diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index dcbd07a54..95de71cad 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -11,6 +11,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' @@ -28,25 +32,25 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: logging-analytics-arm64 - project-name: 'logging-analytics-arm64' - jobs: - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: 'logging-analytics' - stream: - - 'master': - branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'logging-analytics-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: logging-analytics-arm64 +# project-name: 'logging-analytics-arm64' +# jobs: +# - '{project-name}-{stream}-docker-version-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: 'logging-analytics' +# stream: +# - 'master': +# branch: 'master' +# - 'casablanca': +# branch: 'casablanca' +# mvn-settings: 'logging-analytics-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: logging-analytics-sonar jobs: @@ -79,6 +83,10 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{subproject}-python-staging-{stream}' - '{project-name}-{subproject}-python-release-{stream}' files: '**' diff --git a/jjb/modeling/build-modeling-genericparser-docker-image.sh b/jjb/modeling/build-modeling-genericparser-docker-image.sh new file mode 100644 index 000000000..d570d18a2 --- /dev/null +++ b/jjb/modeling/build-modeling-genericparser-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./docker/*.* + +./docker/build_image.sh + diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml similarity index 54% rename from jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml rename to jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml index d15748925..032881c2c 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml +++ b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml @@ -1,14 +1,13 @@ --- - project: - name: vfc-gvnfm-vnfmgr-csit + name: modeling-genericparser-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-gvnfm-vnfmgr' + project-name: 'modeling-genericparser' stream: 'master' functionality: - 'sanity-check': - trigger_jobs: 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily' + trigger_jobs: 'modeling-genericparser-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master' - + branch: 'master' \ No newline at end of file diff --git a/jjb/modeling/modeling-toscaparsers-genericparser.yaml b/jjb/modeling/modeling-toscaparsers-genericparser.yaml new file mode 100644 index 000000000..f21e60cd7 --- /dev/null +++ b/jjb/modeling/modeling-toscaparsers-genericparser.yaml @@ -0,0 +1,60 @@ +--- + +- project: + name: modeling-genericparser + project-name: 'modeling-genericparser' + project: 'modeling/genericparser' + stream: + - 'master': + branch: 'master' + mvn-settings: 'modeling-genericparser-settings' + subproject: + - 'genericparser': + path: '.' + pattern: '**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-modeling-genericparser-docker-image.sh' + build-node: ubuntu1604-docker-8c-8g + files: '**' + archive-artifacts: '' + build-node: centos7-redis-4c-4g + +- project: + name: modeling-genericparser-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: centos7-redis-4c-4g + project: 'modeling/genericparser' + project-name: 'modeling-genericparser' + branch: 'master' + mvn-settings: 'modeling-genericparser-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: modeling-genericparser-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: modeling/genericparser + project-name: 'modeling-genericparser' + build-node: centos7-redis-4c-4g + branch: 'master' + mvn-settings: 'modeling-genericparser-settings' + +- project: + name: modeling-genericparser-info + project-name: modeling-genericparser + jobs: + - gerrit-info-yaml-verify + project: modeling/genericparser + branch: master diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml deleted file mode 100644 index 5b72b09cd..000000000 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ /dev/null @@ -1,59 +0,0 @@ ---- -- project: - name: modeling-project-view - project-name: modeling - views: - - project-view - -- project: - name: modeling-toscaparsers-javatoscachecker - project-name: 'modeling-toscaparsers-javatoscachecker' - project: 'modeling/toscaparsers' - stream: - - 'master': - branch: 'master' - mvn-settings: 'modeling-toscaparsers-settings' - build-node: ubuntu1604-docker-8c-8g - subproject: - - 'javatoscachecker': - pattern: 'javatoscachecker/**' - pom: 'javatoscachecker/pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-properties-daily': - setVersion: 'DontSetVersion' - docker-pom: 'javatoscachecker/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - maven-properties: | - skip.docker.build=false - skip.docker.tag=false - skip.docker.push=false - -- project: - name: modeling-toscaparsers-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'modeling/toscaparsers' - project-name: 'modeling-toscaparsers' - branch: 'master' - mvn-params: '-f javatoscachecker/pom.xml' - mvn-settings: 'modeling-toscaparsers-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: modeling-toscaparsers-javatoscachecker-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f javatoscachecker/pom.xml' - nexus-iq-namespace: 'onap-' - project: modeling/toscaparsers - project-name: 'modeling-toscaparsers-javatoscachecker' - build-node: ubuntu1604-docker-8c-8g - branch: 'master' - mvn-settings: 'modeling-toscaparsers-settings' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index a86a1784e..75294851b 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -27,25 +27,25 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: msb-apigateway-arm64 - project-name: 'msb-apigateway-arm64' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-apigateway-docker-image.sh' - - project: 'msb/apigateway' - stream: - - 'master': - branch: 'master' - mvn-settings: 'msb-apigateway-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: msb-apigateway-arm64 +# project-name: 'msb-apigateway-arm64' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-apigateway-docker-image.sh' +# +# project: 'msb/apigateway' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'msb-apigateway-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: msb-apigateway-sonar jobs: @@ -68,3 +68,11 @@ project-name: 'msb-apigateway' branch: 'master' mvn-settings: 'msb-apigateway-settings' + +- project: + name: msb-apigateway-info + project-name: msb-apigateway + jobs: + - gerrit-info-yaml-verify + project: msb/apigateway + branch: master diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 53976484c..fe84a2c81 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -21,24 +21,24 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: msb-discovery-arm64 - project-name: 'msb-discovery-arm64' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-discovery-docker-image.sh' - build-node: ubuntu1604-docker-arm64-4c-2g - project: 'msb/discovery' - stream: - - 'master': - branch: 'master' - mvn-settings: 'msb-discovery-settings' - files: '**' - archive-artifacts: '' - +#- project: +# name: msb-discovery-arm64 +# project-name: 'msb-discovery-arm64' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-discovery-docker-image.sh' +# build-node: ubuntu1604-docker-arm64-4c-2g +# project: 'msb/discovery' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'msb-discovery-settings' +# files: '**' +# archive-artifacts: '' +# - project: name: msb-discovery-sonar jobs: @@ -61,3 +61,11 @@ project-name: 'msb-discovery' branch: 'master' mvn-settings: 'msb-discovery-settings' + +- project: + name: msb-discovery-info + project-name: msb-discovery + jobs: + - gerrit-info-yaml-verify + project: msb/discovery + branch: master diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 537f1f444..5394ba135 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -37,3 +37,11 @@ project-name: 'msb-java-sdk' branch: 'master' mvn-settings: 'msb-java-sdk-settings' + +- project: + name: msb-java-sdk-info + project-name: msb-java-sdk + jobs: + - gerrit-info-yaml-verify + project: msb/java-sdk + branch: master diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 476dee3fe..732d61897 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -37,3 +37,11 @@ project-name: 'msb-swagger-sdk' branch: 'master' mvn-settings: 'msb-swagger-sdk-settings' + +- project: + name: msb-swagger-sdk-info + project-name: msb-swagger-sdk + jobs: + - gerrit-info-yaml-verify + project: msb/swagger-sdk + branch: master diff --git a/jjb/multicloud/build-multicloud-framework-docker-image.sh b/jjb/multicloud/build-multicloud-framework-docker-image.sh index b749b30ef..9d78d73ff 100755 --- a/jjb/multicloud/build-multicloud-framework-docker-image.sh +++ b/jjb/multicloud/build-multicloud-framework-docker-image.sh @@ -6,5 +6,7 @@ CURRENTDIR="$(pwd)" echo $CURRENTDIR chmod 755 ./multivimbroker/docker/*.* +chmod 755 ./artifactbroker/docker/*.* -./multivimbroker/docker/build_image.sh \ No newline at end of file +./multivimbroker/docker/build_image.sh +./artifactbroker/docker/build_image.sh \ No newline at end of file diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 26842cb18..5ae882847 100755 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -5,14 +5,16 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./newton/docker/*.* chmod 755 ./ocata/docker/*.* chmod 755 ./windriver/docker/*.* chmod 755 ./pike/docker/*.* chmod 755 ./starlingx/docker/*.* +chmod 755 ./lenovo/docker/*.* +chmod 755 ./fcaps/docker/*.* -./newton/docker/build_image.sh ./ocata/docker/build_image.sh ./windriver/docker/build_image.sh ./pike/docker/build_image.sh ./starlingx/docker/build_image.sh +./lenovo/docker/build_image.sh +./fcaps/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index 520a97aec..b90b9298e 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -16,6 +16,10 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -27,28 +31,28 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-2g -- project: - name: multicloud-azure-arm64-java - project-name: 'multicloud-azure-arm64' - project: 'multicloud/azure' - stream: - - 'master': - branch: 'master' - mvn-settings: 'multicloud-azure-settings' - subproject: - - 'azure': - pom: 'azure/pom.xml' - pattern: 'azure/**' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-multicloud-azure-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: multicloud-azure-arm64-java +# project-name: 'multicloud-azure-arm64' +# project: 'multicloud/azure' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'multicloud-azure-settings' +# subproject: +# - 'azure': +# pom: 'azure/pom.xml' +# pattern: 'azure/**' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-multicloud-azure-docker-image.sh' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: multicloud-azure-sonar jobs: @@ -71,3 +75,11 @@ project-name: 'multicloud-azure' branch: 'master' mvn-settings: 'multicloud-azure-settings' + +- project: + name: multicloud-azure-info + project-name: multicloud-azure + jobs: + - gerrit-info-yaml-verify + project: multicloud/azure + branch: master diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index d59d92ed0..c2b72cf84 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -11,12 +11,19 @@ - 'multivimbroker': pom: 'multivimbroker/pom.xml' pattern: 'multivimbroker/**' + - 'artifactbroker': + pom: 'artifactbroker/pom.xml' + pattern: 'artifactbroker/**' jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -27,47 +34,74 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +#- project: +# name: multicloud-framework-arm64-java +# project-name: 'multicloud-framework-arm64' +# project: 'multicloud/framework' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'multicloud-framework-settings' +# subproject: +# - 'multivimbroker': +# pom: 'multivimbroker/pom.xml' +# pattern: 'multivimbroker/**' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-multicloud-framework-docker-image.sh' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: - name: multicloud-framework-arm64-java - project-name: 'multicloud-framework-arm64' + name: multicloud-framework-multivimbroker-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g project: 'multicloud/framework' - stream: - - 'master': - branch: 'master' + project-name: 'multicloud-framework-multivimbroker' + branch: 'master' + mvn-params: '-f multivimbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' - subproject: - - 'multivimbroker': - pom: 'multivimbroker/pom.xml' - pattern: 'multivimbroker/**' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-framework-multivimbroker-clm jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-multicloud-framework-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: multicloud/framework + project-name: 'multicloud-framework-multivimbroker' + branch: 'master' + mvn-params: '-f multivimbroker/pom.xml' + mvn-settings: 'multicloud-framework-settings' - project: - name: multicloud-framework-sonar + name: multicloud-framework-artifactbroker-sonar jobs: - gerrit-maven-sonar cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/framework' - project-name: 'multicloud-framework' + project-name: 'multicloud-framework-artifactbroker' branch: 'master' + mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: - name: multicloud-framework-java-clm + name: multicloud-framework-artifactbroker-clm jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: multicloud/framework - project-name: 'multicloud-framework' + project-name: 'multicloud-framework-artifactbroker' branch: 'master' + mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' diff --git a/jjb/vnfsdk/vnfsdk-ice-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml similarity index 57% rename from jjb/vnfsdk/vnfsdk-ice-csit.yaml rename to jjb/multicloud/multicloud-k8s-csit.yaml index 3fc35c9fc..a5a1540e7 100644 --- a/jjb/vnfsdk/vnfsdk-ice-csit.yaml +++ b/jjb/multicloud/multicloud-k8s-csit.yaml @@ -1,13 +1,13 @@ --- - project: - name: vnfsdk-ice-csit + name: multicloud-k8s-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vnfsdk-ice' + project-name: 'multicloud-k8s' stream: 'master' functionality: - - 'sanity-check': - trigger_jobs: + - 'functionality1': + trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 4131c7f14..d4aa0befd 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -3,7 +3,7 @@ name: multicloud-k8s project-name: 'multicloud-k8s' path: 'src/k8splugin' - golangver: 'golang111' + golangver: 'golang112' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-golang' @@ -24,24 +24,32 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +#- project: +# name: multicloud-k8s-arm64 +# project-name: 'multicloud-k8s-arm64' +# path: 'src/k8splugin' +# golangver: 'golang112' +# jobs: +# - '{project-name}-{stream}-docker-golang-shell-daily': +# script: +# !include-raw-escape: 'build-multicloud-k8s-docker-image.sh' +# project: 'multicloud/k8s' +# subproject: +# - validation-scripts: +# path: '.' +# pattern: '**' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'multicloud-k8s-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g + - project: - name: multicloud-k8s-arm64 - project-name: 'multicloud-k8s-arm64' - path: 'src/k8splugin' - golangver: 'golang111' + name: multicloud-k8s-info + project-name: multicloud-k8s jobs: - - '{project-name}-{stream}-docker-golang-shell-daily': - script: - !include-raw-escape: 'build-multicloud-k8s-docker-image.sh' - project: 'multicloud/k8s' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'multicloud-k8s-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g + - gerrit-info-yaml-verify + project: multicloud/k8s + branch: master diff --git a/jjb/multicloud/multicloud-openstack-casablanca.yaml b/jjb/multicloud/multicloud-openstack-casablanca.yaml deleted file mode 100644 index bbe90c551..000000000 --- a/jjb/multicloud/multicloud-openstack-casablanca.yaml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- project: - name: multicloud-openstack-casablanca - project-name: 'multicloud-openstack-casablanca' - project: 'multicloud/openstack' - stream: - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'multicloud-openstack-settings' - subproject: - - 'newton': - path: 'newton' - pattern: 'newton/**' - pom: 'newton/pom.xml' - - 'newton_share': - path: 'newton' - pattern: 'share/**' - pom: 'newton/pom.xml' - - 'ocata': - path: 'ocata' - pattern: 'ocata/**' - pom: 'ocata/pom.xml' - - 'ocata_share': - path: 'ocata' - pattern: 'share/**' - pom: 'ocata/pom.xml' - - 'pike': - path: 'pike' - pattern: 'pike/**' - pom: 'pike/pom.xml' - - 'pike_share': - path: 'pike' - pattern: 'share/**' - pom: 'pike/pom.xml' - - 'windriver': - path: 'windriver' - pattern: 'windriver/**' - pom: 'windriver/pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' - build-node: ubuntu1604-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-memcached-4c-4g' - - diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml similarity index 53% rename from jjb/usecaseui/usecase-ui-server-csit.yaml rename to jjb/multicloud/multicloud-openstack-fcaps-csit.yaml index b348d065f..9630ab3f5 100644 --- a/jjb/usecaseui/usecase-ui-server-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml @@ -1,12 +1,13 @@ +--- - project: - name: usecase-ui-server-csit + name: multicloud-openstack-fcaps-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'usecase-ui-server' + project-name: 'multicloud-fcaps' stream: 'master' functionality: - - 'testsuite': - trigger_jobs: '{project-name}-{stream}-docker-java-daily' + - 'functionality1': + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml similarity index 52% rename from jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml rename to jjb/multicloud/multicloud-openstack-lenovo-csit.yaml index 5c9335f29..b97abdae1 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml @@ -1,13 +1,13 @@ ---- -- project: - name: modeling-toscaparsers-javatoscachecker-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'modeling-toscaparsers-javatoscachecker' - stream: 'master' - functionality: - - 'APIs': - trigger_jobs: '{project-name}-{stream}-release-version-java-daily' - robot-options: '' - branch: 'master' +--- +- project: + name: multicloud-openstack-lenovo-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-lenovo' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml index 374b27fa0..d44ac3c51 100644 --- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml @@ -10,10 +10,10 @@ - 'functionality1': trigger_jobs: - 'multicloud-openstack-master-docker-java-version-shell-daily' - - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' +# - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' - 'hpa-discovery': trigger_jobs: - 'multicloud-openstack-master-docker-java-version-shell-daily' - - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' +# - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml index c8a6cd88b..2e3685680 100644 --- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml @@ -10,6 +10,6 @@ - 'functionality1': trigger_jobs: - 'multicloud-openstack-master-docker-java-version-shell-daily' - - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' +# - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml index 4c56a372d..4becc196c 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml @@ -10,6 +10,6 @@ - 'functionality1': trigger_jobs: - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' - - 'multicloud-openstack-vmware-arm64-master-docker-java-version-shell-daily' +# - 'multicloud-openstack-vmware-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 3c8be8acf..40c79e634 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -16,6 +16,10 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -27,28 +31,28 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: multicloud-openstack-vmware-arm64-java - project-name: 'multicloud-openstack-vmware-arm64' - project: 'multicloud/openstack/vmware' - stream: - - 'master': - branch: 'master' - mvn-settings: 'multicloud-openstack-vmware-settings' - subproject: - - 'vio': - pom: 'vio/pom.xml' - pattern: 'vio/**' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh' - build-node: ubuntu1604-docker-arm64-4c-2g - files: '**' - archive-artifacts: '' - +#- project: +# name: multicloud-openstack-vmware-arm64-java +# project-name: 'multicloud-openstack-vmware-arm64' +# project: 'multicloud/openstack/vmware' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'multicloud-openstack-vmware-settings' +# subproject: +# - 'vio': +# pom: 'vio/pom.xml' +# pattern: 'vio/**' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh' +# build-node: ubuntu1604-docker-arm64-4c-2g +# files: '**' +# archive-artifacts: '' +# - project: name: multicloud-openstack-vmware-sonar jobs: @@ -71,3 +75,11 @@ project-name: 'multicloud-openstack-vmware' branch: 'master' mvn-settings: 'multicloud-openstack-vmware-settings' + +- project: + name: multicloud-openstack-vmware-info + project-name: multicloud-openstack-vmware + jobs: + - gerrit-info-yaml-verify + project: multicloud/openstack/vmware + branch: master diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml index 6718c4dc3..00665222b 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml @@ -14,6 +14,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -25,24 +29,24 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: multicloud-openstack-vmware-vesagent-arm64-java - project-name: 'multicloud-openstack-vmware-vesagent-arm64' - project: 'multicloud/openstack/vmware' - stream: - - 'master': - branch: 'master' - mvn-settings: 'multicloud-openstack-vmware-settings' - subproject: - - 'vesagent': - pom: 'vesagent/pom.xml' - pattern: 'vesagent/**' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh' - build-node: ubuntu1604-docker-arm64-4c-2g - files: '**' - archive-artifacts: '' +#- project: +# name: multicloud-openstack-vmware-vesagent-arm64-java +# project-name: 'multicloud-openstack-vmware-vesagent-arm64' +# project: 'multicloud/openstack/vmware' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'multicloud-openstack-vmware-settings' +# subproject: +# - 'vesagent': +# pom: 'vesagent/pom.xml' +# pattern: 'vesagent/**' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh' +# build-node: ubuntu1604-docker-arm64-4c-2g +# files: '**' +# archive-artifacts: '' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 1dbac8366..9947419b9 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -14,14 +14,6 @@ branch: 'master' mvn-settings: 'multicloud-openstack-settings' subproject: - - 'newton': - path: 'newton' - pattern: 'newton/**' - pom: 'newton/pom.xml' - - 'newton_share': - path: 'newton' - pattern: 'share/**' - pom: 'newton/pom.xml' - 'ocata': path: 'ocata' pattern: 'ocata/**' @@ -50,10 +42,30 @@ path: 'windriver' pattern: 'windriver/**' pom: 'windriver/pom.xml' + - 'windriver_share': + path: 'windriver' + pattern: 'share/**' + pom: 'windriver/pom.xml' + - 'fcaps': + path: 'fcaps' + pattern: 'fcaps/**' + pom: 'fcaps/pom.xml' + - 'lenovo': + path: 'lenovo' + pattern: 'lenovo/**' + pom: 'lenovo/pom.xml' + - 'lenovo_share': + path: 'lenovo' + pattern: 'share/**' + pom: 'lenovo/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -65,38 +77,24 @@ archive-artifacts: '' build-node: 'ubuntu1604-memcached-4c-4g' -- project: - name: multicloud-openstack-arm64 - project-name: 'multicloud-openstack-arm64' - project: 'multicloud/openstack' - stream: - - 'master': - branch: 'master' - mvn-settings: 'multicloud-openstack-settings' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' - build-node: ubuntu1604-docker-arm64-4c-2g - files: '**' - archive-artifacts: '' - -- project: - name: multicloud-openstack-newton-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'multicloud/openstack' - project-name: 'multicloud-openstack-newton' - branch: 'master' - mvn-params: '-f newton/pom.xml' - mvn-settings: 'multicloud-openstack-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - +#- project: +# name: multicloud-openstack-arm64 +# project-name: 'multicloud-openstack-arm64' +# project: 'multicloud/openstack' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'multicloud-openstack-settings' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' +# build-node: ubuntu1604-docker-arm64-4c-2g +# files: '**' +# archive-artifacts: '' +# - project: name: multicloud-openstack-ocata-sonar jobs: @@ -163,3 +161,39 @@ build-node: ubuntu1604-memcached-4c-4g branch: 'master' mvn-settings: 'multicloud-openstack-settings' + +- project: + name: multicloud-openstack-fcaps-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack-fcaps' + branch: 'master' + mvn-params: '-f fcaps/pom.xml' + mvn-settings: 'multicloud-openstack-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-openstack-lenovo-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack-lenovo' + branch: 'master' + mvn-params: '-f lenovo/pom.xml' + mvn-settings: 'multicloud-openstack-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-openstack-info + project-name: multicloud-openstack + jobs: + - gerrit-info-yaml-verify + project: multicloud/openstack + branch: master diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index 69fa0c471..261c94a07 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -17,3 +17,11 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: music-distributed-kv-store-info + project-name: music-distributed-kv-store + jobs: + - gerrit-info-yaml-verify + project: music/distributed-kv-store + branch: master diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml index 172d1e583..cd0e24624 100644 --- a/jjb/music/music-mdbc.yaml +++ b/jjb/music/music-mdbc.yaml @@ -5,6 +5,10 @@ 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-name}-{stream}-release-version-java-daily' project: 'music/mdbc' stream: @@ -25,3 +29,11 @@ project-name: 'music-mdbc' branch: 'master' mvn-settings: 'music-mdbc-settings' + +- project: + name: music-mdbc-info + project-name: music-mdbc + jobs: + - gerrit-info-yaml-verify + project: music/mdbc + branch: master diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml index a86189221..7025c95e0 100644 --- a/jjb/music/music-prom.yaml +++ b/jjb/music/music-prom.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: docker @@ -32,3 +35,11 @@ project-name: 'music-prom' branch: 'master' mvn-settings: 'music-prom-settings' + +- project: + name: music-prom-info + project-name: music-prom + jobs: + - gerrit-info-yaml-verify + project: music/prom + branch: master diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml deleted file mode 100644 index 105dedd25..000000000 --- a/jjb/music/music-trigger.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- project: - name: music-trigger - project-name: 'music' - subproject: - - 'music-trigger': - pom: 'musictrigger/pom.xml' - pattern: 'musictrigger/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - project: 'music' - stream: - - 'trigger-casablanca': - branch: 'casablanca' - mvn-settings: 'music-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - - -- project: - name: music-trigger-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f musictrigger/pom.xml assembly:single' - nexus-iq-namespace: 'onap-' - project: music - project-name: 'music-trigger' - branch: 'master' - mvn-settings: 'music-settings' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 698799662..816f83ca3 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: docker @@ -21,10 +24,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - - 'dev-cassandra-only': - branch: 'dev-cassandra-only' + - 'dublin': + branch: 'dublin' mvn-settings: 'music-settings' files: '**' archive-artifacts: '' @@ -53,3 +54,11 @@ project-name: 'music' branch: 'master' mvn-settings: 'music-settings' + +- project: + name: music-info + project-name: music + jobs: + - gerrit-info-yaml-verify + project: music + branch: master diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml index e5266036a..9de048cc0 100644 --- a/jjb/onap-jjb/onap-pypi-template.yaml +++ b/jjb/onap-jjb/onap-pypi-template.yaml @@ -20,6 +20,7 @@ - compare-type: ANT pattern: '**' + submodule-disable: false submodule-timeout: 10 ##################### @@ -52,6 +53,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default wrappers: diff --git a/jjb/oom/offline-installer-review-bootstrap.sh b/jjb/oom/offline-installer-review-bootstrap.sh new file mode 100644 index 000000000..f8454d206 --- /dev/null +++ b/jjb/oom/offline-installer-review-bootstrap.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# setting-up bash flags +set -x -e -o pipefail + +#Run review script +./offline-installer-review.sh + diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml new file mode 100644 index 000000000..7e462d283 --- /dev/null +++ b/jjb/oom/offline-installer.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: offline-installer + project-name: 'offline-installer' + build-node: 'ubuntu1604-docker-8c-8g' + offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh + + stream: + - 'master': + branch: 'master' + + jobs: + - '{project-name}-{stream}-review': + build_script: '{offline_review_bootstrap}' diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml new file mode 100644 index 000000000..5f95f70b8 --- /dev/null +++ b/jjb/oom/oom-jobs.yaml @@ -0,0 +1,34 @@ +--- +- job-template: + name: '{project-name}-{stream}-review' + node: '{build-node}' + project-type: freestyle + build_script: '' + pattern: '**' + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: 'oom/{project-name}' + stream: '{stream}' + lftools-version: '{lftools-version}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: 'gerrit' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: 'oom/{project-name}' + branch: '{branch}' + files: '{obj:pattern}' + + builders: + - shell: '{obj:build_script}' + + publishers: + - lf-infra-publish + diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index 8e4b001b0..2daca91e2 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -47,3 +47,11 @@ - shell: !include-raw-escape: oneclick-config-make-tar.sh - shell: !include-raw-escape: oneclick-config-build-docker-image.sh - shell: !include-raw-escape: ../include-docker-push.sh + +- project: + name: oomconfig-info + project-name: oomconfig + jobs: + - gerrit-info-yaml-verify + project: oom + branch: master diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 818d0100b..5dc9d3078 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -5,6 +5,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -30,3 +34,11 @@ project-name: 'oom-registrator' branch: 'master' mvn-settings: 'oom-registrator-settings' + +- project: + name: oom-registrator-info + project-name: oom-registrator + jobs: + - gerrit-info-yaml-verify + project: oom/registrator + branch: master diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 1fc2c4c5d..b5f915094 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -11,13 +11,14 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'oparent' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'oparent-settings' files: '**' archive-artifacts: '' @@ -32,3 +33,11 @@ project-name: 'oparent' branch: 'master' mvn-settings: 'oparent-settings' + +- project: + name: oparent-info + project-name: oparent + jobs: + - gerrit-info-yaml-verify + project: oparent + branch: master diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index f9b23856e..5b240f439 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -9,16 +9,14 @@ name: optf-cmso project-name: 'optf-cmso' jobs: + - gerrit-maven-stage: + maven-versions-plugin: true - '{project-name}-{stream}-verify-java-checkstyle': mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' - '{project-name}-{stream}-merge-properties-java': mvn_properties: - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 - - '{project-name}-{stream}-release-java-daily-checkstyle': - setVersion: 'DoSetVersion' - mvn_properties: - - docker.pull.registry=nexus3.onap.org:10001 - '{project-name}-{stream}-docker-java-properties-daily': setVersion: 'DoSetVersion' docker-pom: 'pom.xml' @@ -43,7 +41,7 @@ name: optf-cmso-sonar jobs: - gerrit-maven-sonar: - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001 -DskipIntegrationTests=false' cron: 'H 11 * * *' build-node: ubuntu1604-docker-8c-8g project: 'optf/cmso' @@ -65,6 +63,12 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-cmso-settings' + +- project: + name: optf-cmso-info + project-name: optf-cmso + jobs: + - gerrit-info-yaml-verify + project: optf/cmso + branch: master diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index d5fa4963c..50a8035f8 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -19,7 +17,10 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' @@ -31,8 +32,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -78,6 +77,12 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-has-settings' + +- project: + name: optf-has-info + project-name: optf-has + jobs: + - gerrit-info-yaml-verify + project: optf/has + branch: master diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 762b078d4..094985082 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -18,7 +16,10 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' @@ -30,8 +31,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -77,6 +76,12 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-osdf-settings' + +- project: + name: optf-osdf-info + project-name: optf-osdf + jobs: + - gerrit-info-yaml-verify + project: optf/osdf + branch: master diff --git a/jjb/policy/drools-apps-docker-merge.sh b/jjb/policy/drools-apps-docker-merge.sh new file mode 100644 index 000000000..9291c0b39 --- /dev/null +++ b/jjb/policy/drools-apps-docker-merge.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO MERGE DROOLS APPLICATIONS DOCKER IMAGE =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 controlloop/build/docker-cl + +controlloop/build/docker-cl --merge diff --git a/jjb/policy/drools-apps-docker-release.sh b/jjb/policy/drools-apps-docker-release.sh new file mode 100644 index 000000000..07755b72c --- /dev/null +++ b/jjb/policy/drools-apps-docker-release.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO RELEASE DROOLS APPLICATIONS DOCKER IMAGE =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 controlloop/build/docker-cl + +controlloop/build/docker-cl --release diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index aa5d49bc8..f23b9c1e8 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -21,7 +21,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/apex-pdp' stream: @@ -48,7 +48,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true build-node: ubuntu1604-docker-8c-8g project: 'policy/apex-pdp' stream: @@ -81,3 +81,11 @@ project-name: 'policy-apex-pdp' branch: 'master' mvn-settings: 'policy-apex-pdp-settings' + +- project: + name: policy-apex-pdp-info + project-name: policy-apex-pdp + jobs: + - gerrit-info-yaml-verify + project: policy/apex-pdp + branch: master diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 9c2874b86..946290919 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -4,7 +4,16 @@ project-name: 'policy-api' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + disabled: false + build-node: ubuntu1604-docker-8c-8g project: 'policy/api' stream: @@ -37,3 +46,11 @@ project-name: 'policy-api' branch: 'master' mvn-settings: 'policy-api-settings' + +- project: + name: policy-api-info + project-name: policy-api + jobs: + - gerrit-info-yaml-verify + project: policy/api + branch: master diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index d81fb7e96..ccf6c75dd 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -6,7 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: true + disabled: false project: 'policy/common' stream: @@ -24,7 +24,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true project: 'policy/common' stream: @@ -57,3 +57,11 @@ project-name: 'policy-common' branch: 'master' mvn-settings: 'policy-common-settings' + +- project: + name: policy-common-info + project-name: policy-common + jobs: + - gerrit-info-yaml-verify + project: policy/common + branch: master diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml deleted file mode 100644 index b9bf001e4..000000000 --- a/jjb/policy/policy-core.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: policy-core - project-name: 'policy-core' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - project: 'policy/core' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-core-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: policy-core-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'policy/core' - project-name: 'policy-core' - branch: 'master' - mvn-settings: 'policy-core-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: policy-core-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: policy/core - project-name: 'policy-core' - branch: 'master' - mvn-settings: 'policy-core-settings' diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 90ee700cb..cedbc64a8 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -7,8 +7,6 @@ stream: - 'master': branch: master - - 'casablanca': - branch: casablanca functionality: - 'health' trigger_jobs: @@ -16,6 +14,7 @@ - 'policy-drools-pdp-{stream}-merge-scm-mvn-script' - 'policy-drools-applications-{stream}-merge-java' robot-options: '' + build-timeout: 40 branch: 'master' - project: @@ -27,8 +26,6 @@ stream: - 'master': branch: master - - 'casablanca': - branch: casablanca functionality: - 'apex-pdp' trigger_jobs: @@ -45,11 +42,90 @@ stream: - 'master': branch: master - - 'casablanca': - branch: casablanca functionality: - 'distribution' trigger_jobs: - 'policy-distribution-{stream}-merge-java' robot-options: '' branch: 'master' + +- project: + name: policy-api-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'api' + trigger_jobs: + - 'policy-api-{stream}-merge-java' + robot-options: '' + branch: 'master' + +- project: + name: policy-xacml-pdp-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'xacml-pdp' + trigger_jobs: + - 'policy-xacml-pdp-{stream}-merge-java' + robot-options: '' + branch: 'master' + +- project: + name: policy-pap-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'pap' + trigger_jobs: + - 'policy-pap-{stream}-merge-java' + robot-options: '' + branch: 'master' + +- project: + name: policy-drools-pdp-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'drools-pdp' + trigger_jobs: + - 'policy-drools-pdp-{stream}-merge-java' + robot-options: '' + branch: 'master' + +- project: + name: policy-drools-applications-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'drools-applications' + trigger_jobs: + - 'policy-drools-applications-{stream}-merge-java' + robot-options: '' + branch: 'master' + diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 6c529c89a..6c5753c69 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -12,7 +12,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/distribution' @@ -37,7 +37,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: false + disabled: true build-node: ubuntu1604-docker-8c-8g project: 'policy/distribution' @@ -71,3 +71,11 @@ project-name: 'policy-distribution' branch: 'master' mvn-settings: 'policy-distribution-settings' + +- project: + name: policy-distribution-info + project-name: policy-distribution + jobs: + - gerrit-info-yaml-verify + project: policy/distribution + branch: master diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml new file mode 100644 index 000000000..c378217a0 --- /dev/null +++ b/jjb/policy/policy-docker-base-common.yaml @@ -0,0 +1,56 @@ +--- +- project: + name: policy-docker-base-common + project-name: 'policy-docker' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: "-P docker" + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker' + disabled: false + build-node: ubuntu1604-docker-8c-8g + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-docker-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: policy-docker-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'policy/docker' + project-name: 'policy-docker' + branch: 'master' + mvn-settings: 'policy-docker-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-docker-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: policy/docker + project-name: 'policy-docker' + branch: 'master' + mvn-settings: 'policy-docker-settings' + +- project: + name: policy-docker-info + project-name: policy-docker + jobs: + - gerrit-info-yaml-verify + project: policy/docker + branch: master diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 7661e5079..bab2c2e52 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -4,9 +4,19 @@ project-name: 'policy-drools-applications' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: true + - '{project-name}-{stream}-merge-scm-mvn-script': + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'drools-apps-docker-merge.sh' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'drools-apps-docker-release.sh' + disabled: false + build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-applications' stream: @@ -24,7 +34,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true project: 'policy/drools-applications' stream: @@ -57,3 +67,11 @@ project-name: 'policy-drools-applications' branch: 'master' mvn-settings: 'policy-drools-applications-settings' + +- project: + name: policy-drools-applications-info + project-name: policy-drools-applications + jobs: + - gerrit-info-yaml-verify + project: policy/drools-applications + branch: master diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 5e34e7791..c7ab5c2b3 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -15,7 +15,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-pdp' stream: @@ -42,7 +42,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-pdp' stream: @@ -76,3 +76,11 @@ project-name: 'policy-drools-pdp' branch: 'master' mvn-settings: 'policy-drools-pdp-settings' + +- project: + name: policy-drools-pdp-info + project-name: policy-drools-pdp + jobs: + - gerrit-info-yaml-verify + project: policy/drools-pdp + branch: master diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index a52553818..114adb78e 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -15,7 +15,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/engine' stream: @@ -42,7 +42,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true build-node: ubuntu1604-docker-8c-8g project: 'policy/engine' stream: @@ -70,10 +70,18 @@ name: policy-engine-clm jobs: - gerrit-maven-clm: - build-timeout: 30 + build-timeout: 40 nexus-iq-namespace: 'onap-' project: policy/engine project-name: 'policy-engine' branch: 'master' mvn-settings: 'policy-engine-settings' build-node: 'ubuntu1604-builder-4c-4g' + +- project: + name: policy-engine-info + project-name: policy-engine + jobs: + - gerrit-info-yaml-verify + project: policy/engine + branch: master diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml deleted file mode 100644 index dd621599a..000000000 --- a/jjb/policy/policy-gui.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: policy-gui - project-name: 'policy-gui' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - project: 'policy/gui' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-gui-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: policy-gui-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'policy/gui' - project-name: 'policy-gui' - branch: 'master' - mvn-settings: 'policy-gui-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: policy-gui-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: policy/gui - project-name: 'policy-gui' - branch: 'master' - mvn-settings: 'policy-gui-settings' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 9d332ccbc..b7507abb7 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -5,6 +5,8 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily': + disabled: false project: 'policy/models' stream: @@ -37,3 +39,11 @@ project-name: 'policy-models' branch: 'master' mvn-settings: 'policy-models-settings' + +- project: + name: policy-models-info + project-name: policy-models + jobs: + - gerrit-info-yaml-verify + project: policy/models + branch: master diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 0b8e733ea..e33bb2380 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -4,7 +4,16 @@ project-name: 'policy-pap' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + disabled: false + build-node: ubuntu1604-docker-8c-8g project: 'policy/pap' stream: @@ -37,3 +46,11 @@ project-name: 'policy-pap' branch: 'master' mvn-settings: 'policy-pap-settings' + +- project: + name: policy-pap-info + project-name: policy-pap + jobs: + - gerrit-info-yaml-verify + project: policy/pap + branch: master diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 525ffe358..22c1edf17 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -6,7 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: true + disabled: false project: 'policy/parent' stream: @@ -44,3 +44,11 @@ project-name: 'policy-parent' branch: 'master' mvn-settings: 'policy-parent-settings' + +- project: + name: policy-parent-info + project-name: policy-parent + jobs: + - gerrit-info-yaml-verify + project: policy/parent + branch: master diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml deleted file mode 100644 index fd93a3c3d..000000000 --- a/jjb/policy/policy-pdp.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: policy-pdp - project-name: 'policy-pdp' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - project: 'policy/pdp' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-pdp-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: policy-pdp-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'policy/pdp' - project-name: 'policy-pdp' - branch: 'master' - mvn-settings: 'policy-pdp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: policy-pdp-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: policy/pdp - project-name: 'policy-pdp' - branch: 'master' - mvn-settings: 'policy-pdp-settings' diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 83e590cc5..1ad7b7a1b 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -4,7 +4,16 @@ project-name: 'policy-xacml-pdp' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + disabled: false + build-node: ubuntu1604-docker-8c-8g project: 'policy/xacml-pdp' stream: @@ -37,3 +46,11 @@ project-name: 'policy-xacml-pdp' branch: 'master' mvn-settings: 'policy-xacml-pdp-settings' + +- project: + name: policy-xacml-pdp-info + project-name: policy-xacml-pdp + jobs: + - gerrit-info-yaml-verify + project: policy/xacml-pdp + branch: master diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index 45a4541f5..d77ea9fe0 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -16,8 +16,8 @@ stream: - 'master': branch: 'master' - - 'release-2.4.0': - branch: 'release-2.4.0' + - 'release-2.5.0': + branch: 'release-2.5.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' @@ -48,3 +48,11 @@ project-name: 'portal-sdk' branch: 'master' mvn-settings: 'portal-sdk-settings' + +- project: + name: portal-sdk-info + project-name: portal-sdk + jobs: + - gerrit-info-yaml-verify + project: portal/sdk + branch: master diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 9e7305088..ce944dd9e 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -9,6 +9,10 @@ name: portal project-name: 'portal' jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-java-daily' project: 'portal' stream: @@ -45,3 +49,11 @@ branch: 'master' build-node: ubuntu1604-builder-4c-4g mvn-settings: 'portal-settings' + +- project: + name: portal-info + project-name: portal + jobs: + - gerrit-info-yaml-verify + project: portal + branch: master diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 42c93cf9c..7ec4294d7 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'sanity': trigger_jobs: '{project-name}-{stream}-sdc-merge-java' @@ -22,23 +22,23 @@ html-dir: 'archives' html-files: 'SDC_CI_Extent_Report.html' -- project: - name: sdc-csit-arm64 - jobs: - - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng' - - '{project-name}-arm64-{stream}-csit-{functionality}-testng' - project-name: 'sdc' - stream: - - 'master': - branch: 'master' - functionality: - - 'sanity': - trigger_jobs: '{project-name}-{stream}-sdc-merge-java' - - 'nightly': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' - - 'uiSanity': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' - robot-options: '' - branch: 'master' - html-dir: 'archives' - html-files: 'SDC_CI_Extent_Report.html' +#- project: +# name: sdc-csit-arm64 +# jobs: +# - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng' +# - '{project-name}-arm64-{stream}-csit-{functionality}-testng' +# project-name: 'sdc' +# stream: +# - 'master': +# branch: 'master' +# functionality: +# - 'sanity': +# trigger_jobs: '{project-name}-{stream}-sdc-merge-java' +# - 'nightly': +# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' +# - 'uiSanity': +# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' +# robot-options: '' +# branch: 'master' +# html-dir: 'archives' +# html-files: 'SDC_CI_Extent_Report.html' diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index 5c4385bc6..0cd41f1e1 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -21,31 +21,31 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'sdc-dcae-d-ci-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -- project: - name: sdc-dcae-d-ci-arm64 - project-name: 'sdc-dcae-d-ci-arm64' - jobs: - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-DskipTests=true' - build-node: 'ubuntu1604-docker-arm64-4c-2g' - project: 'sdc/dcae-d/ci' - stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-ci-settings' files: '**' archive-artifacts: '' build-timeout: 60 +#- project: +# name: sdc-dcae-d-ci-arm64 +# project-name: 'sdc-dcae-d-ci-arm64' +# jobs: +# - '{project-name}-{stream}-docker-version-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-DskipTests=true' +# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# project: 'sdc/dcae-d/ci' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdc-dcae-d-ci-settings' +# files: '**' +# archive-artifacts: '' +# build-timeout: 60 +# - project: name: sdc-dcae-ci-sonar jobs: @@ -54,7 +54,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/ci' project-name: 'sdc-dcae-d-ci' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-ci-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -67,5 +67,13 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/ci project-name: 'sdc-dcae-d-ci' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-ci-settings' + +- project: + name: sdc-dcae-d-ci-info + project-name: sdc-dcae-d-ci + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/ci + branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 3630b4dde..b6e538401 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -15,32 +15,32 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' files: '**' archive-artifacts: '' build-timeout: 60 -- project: - name: sdc-dcae-d-dt-be-main-arm64 - project-name: 'sdc-dcae-d-dt-be-main-arm64' - jobs: - - '{project-name}-{stream}-docker-version-java-daily': - build-node: 'ubuntu1604-docker-arm64-4c-2g' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-DskipTests=true' - project: 'sdc/dcae-d/dt-be-main' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-main-settings' - build-node: ubuntu1604-docker-arm64-4c-2g - files: '**' - archive-artifacts: '' - build-timeout: 60 - +#- project: +# name: sdc-dcae-d-dt-be-main-arm64 +# project-name: 'sdc-dcae-d-dt-be-main-arm64' +# jobs: +# - '{project-name}-{stream}-docker-version-java-daily': +# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-DskipTests=true' +# project: 'sdc/dcae-d/dt-be-main' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdc-dcae-d-dt-be-main-settings' +# build-node: ubuntu1604-docker-arm64-4c-2g +# files: '**' +# archive-artifacts: '' +# build-timeout: 60 +# - project: name: sdc-dcae-d-dt-be-main-sonar jobs: @@ -49,7 +49,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt-be-main' project-name: 'sdc-dcae-d-dt-be-main' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -62,5 +62,13 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/dt-be-main project-name: 'sdc-dcae-d-dt-be-main' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' + +- project: + name: sdc-dcae-d-dt-be-main-info + project-name: sdc-dcae-d-dt-be-main + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/dt-be-main + branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index 3949f62f0..7bc3c341a 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -10,8 +10,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' files: '**' archive-artifacts: '' @@ -25,7 +25,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt-be-property' project-name: 'sdc-dcae-d-dt-be-property' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -38,5 +38,13 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/dt-be-property project-name: 'sdc-dcae-d-dt-be-property' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' + +- project: + name: sdc-dcae-d-dt-be-property-info + project-name: sdc-dcae-d-dt-be-property + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/dt-be-property + branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 6338c8c04..9b83d0b10 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -16,32 +16,32 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'sdc-dcae-d-dt-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -- project: - name: sdc-dcae-d-dt-arm64 - project-name: 'sdc-dcae-d-dt-arm64' - build-node: ubuntu1604-docker-arm64-4c-2g - jobs: - - '{project-name}-{stream}-docker-version-java-daily': - build-node: 'ubuntu1604-docker-arm64-4c-2g' - docker-pom: 'pom.xml' - mvn-profile: 'server,docker' - mvn-params: '-DskipTests=true' - project: 'sdc/dcae-d/dt' - stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-settings' files: '**' archive-artifacts: '' build-timeout: 60 +#- project: +# name: sdc-dcae-d-dt-arm64 +# project-name: 'sdc-dcae-d-dt-arm64' +# build-node: ubuntu1604-docker-arm64-4c-2g +# jobs: +# - '{project-name}-{stream}-docker-version-java-daily': +# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# docker-pom: 'pom.xml' +# mvn-profile: 'server,docker' +# mvn-params: '-DskipTests=true' +# project: 'sdc/dcae-d/dt' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdc-dcae-d-dt-settings' +# files: '**' +# archive-artifacts: '' +# build-timeout: 60 +# - project: name: sdc-dcae-d-dt-sonar jobs: @@ -50,7 +50,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt' project-name: 'sdc-dcae-d-dt' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -64,5 +64,13 @@ project: sdc/dcae-d/dt project-name: 'sdc-dcae-d-dt' build-node: ubuntu1604-builder-4c-2g - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-settings' + +- project: + name: sdc-dcae-d-dt-info + project-name: sdc-dcae-d-dt + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/dt + branch: master diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 9cc5de72c..67f00ecce 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -16,31 +16,31 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'sdc-dcae-d-fe-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -- project: - name: sdc-dcae-d-fe-arm64 - project-name: 'sdc-dcae-d-fe-arm64' - jobs: - - '{project-name}-{stream}-docker-version-java-daily': - build-node: 'ubuntu1604-docker-arm64-4c-2g' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-DskipTests=true' - project: 'sdc/dcae-d/fe' - stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-fe-settings' files: '**' archive-artifacts: '' build-timeout: 60 +#- project: +# name: sdc-dcae-d-fe-arm64 +# project-name: 'sdc-dcae-d-fe-arm64' +# jobs: +# - '{project-name}-{stream}-docker-version-java-daily': +# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-DskipTests=true' +# project: 'sdc/dcae-d/fe' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdc-dcae-d-fe-settings' +# files: '**' +# archive-artifacts: '' +# build-timeout: 60 +# - project: name: sdc-dcae-d-fe-sonar jobs: @@ -49,7 +49,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/fe' project-name: 'sdc-dcae-d-fe' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-fe-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -63,5 +63,13 @@ project: sdc/dcae-d/fe project-name: 'sdc-dcae-d-fe' build-node: ubuntu1604-builder-4c-2g - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-fe-settings' + +- project: + name: sdc-dcae-d-fe-info + project-name: sdc-dcae-d-fe + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/fe + branch: master diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 6b4a3b69a..e71802497 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' subproject: - dcae-d-tosca-lab: path: '.' @@ -21,25 +21,25 @@ docker-pom: 'pom.xml' mvn-profile: 'default' -- project: - name: sdc-dcae-d-tosca-lab-arm64 - project-name: 'sdc-dcae-d-tosca-lab-arm64' - project: 'sdc/dcae-d/tosca-lab' - stream: - - 'master': - branch: 'master' - subproject: - - dcae-d-tosca-lab: - path: '.' - pattern: '**' - mvn-settings: 'sdc-dcae-d-tosca-lab-settings' - build-node: ubuntu1604-docker-arm64-4c-2g - jobs: - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' - +#- project: +# name: sdc-dcae-d-tosca-lab-arm64 +# project-name: 'sdc-dcae-d-tosca-lab-arm64' +# project: 'sdc/dcae-d/tosca-lab' +# stream: +# - 'master': +# branch: 'master' +# subproject: +# - dcae-d-tosca-lab: +# path: '.' +# pattern: '**' +# mvn-settings: 'sdc-dcae-d-tosca-lab-settings' +# build-node: ubuntu1604-docker-arm64-4c-2g +# jobs: +# - '{project-name}-{stream}-docker-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# docker-pom: 'pom.xml' +# mvn-profile: 'default' +# - project: name: sdc-dcae-d-tosca-lab-sonar jobs: @@ -48,8 +48,16 @@ build-node: ubuntu1604-docker-8c-8g project: 'sdc/dcae-d/tosca-lab' project-name: 'sdc-dcae-d-tosca-lab' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-dcae-d-tosca-lab-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-dcae-d-tosca-lab-info + project-name: sdc-dcae-d-tosca-lab + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/tosca-lab + branch: master diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index e6765a4ba..090c215f6 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -16,8 +16,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' @@ -32,7 +32,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/jtosca' project-name: 'sdc-jtosca' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-jtosca-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -45,5 +45,13 @@ nexus-iq-namespace: 'onap-' project: sdc/jtosca project-name: 'sdc-jtosca' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-jtosca-settings' + +- project: + name: sdc-jtosca-info + project-name: sdc-jtosca + jobs: + - gerrit-info-yaml-verify + project: sdc/jtosca + branch: master diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 0f4155c8a..69c6e4a8c 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -45,3 +45,11 @@ project-name: 'sdc-sdc-distribution-client' branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' + +- project: + name: sdc-sdc-distribution-client-info + project-name: sdc-sdc-distribution-client + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-distribution-client + branch: master diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 3560a5f85..03b9d2abc 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -5,33 +5,43 @@ project-name: 'sdc-sdc-docker-base' jobs: - '{project-name}-{stream}-sdc-merge-java': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'default' project: 'sdc/sdc-docker-base' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-8c-8g maven-version: 'mvn35' +#- project: +# name: sdc-sdc-docker-base-arm64 +# project-name: 'sdc-sdc-docker-base-arm64' +# jobs: +# - '{project-name}-{stream}-sdc-merge-java': +# build-node: 'ubuntu1604-docker-8c-8g' +# docker-pom: 'pom.xml' +# mvn-profile: 'default' +# project: 'sdc/sdc-docker-base' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdc-sdc-docker-base-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# maven-version: 'mvn35' + - project: - name: sdc-sdc-docker-base-arm64 - project-name: 'sdc-sdc-docker-base-arm64' + name: sdc-sdc-docker-base-info + project-name: sdc-sdc-docker-base jobs: - - '{project-name}-{stream}-sdc-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'default' - project: 'sdc/sdc-docker-base' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-sdc-docker-base-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - maven-version: 'mvn35' + - gerrit-info-yaml-verify + project: sdc/sdc-docker-base + branch: master diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 140953192..b39c9c8dd 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -17,8 +17,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-sdc-pubsub-settings' files: '**' archive-artifacts: '' @@ -33,7 +33,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-pubsub' project-name: 'sdc-sdc-pubsub' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-sdc-pubsub-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index 66a86d029..92f948202 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -31,3 +31,11 @@ project-name: 'sdc-sdc-titan-cassandra' branch: 'master' mvn-settings: 'sdc-sdc-titan-cassandra-settings' + +- project: + name: sdc-sdc-titan-cassandra-info + project-name: sdc-sdc-titan-cassandra + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-titan-cassandra + branch: master diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 90692c748..c862ffcd3 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -16,8 +16,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' @@ -32,7 +32,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-tosca' project-name: 'sdc-sdc-tosca' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-sdc-tosca-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -45,5 +45,13 @@ nexus-iq-namespace: 'onap-' project: sdc/sdc-tosca project-name: 'sdc-sdc-tosca' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-sdc-tosca-settings' + +- project: + name: sdc-sdc-tosca-info + project-name: sdc-sdc-tosca + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-tosca + branch: master diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 30497155e..dcea02630 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' @@ -29,24 +29,24 @@ build-node: ubuntu1604-builder-4c-4g maven-version: 'mvn35' -- project: - name: sdc-sdc-workflow-designer-arm64 - project-name: 'sdc-sdc-workflow-designer-arm64' - jobs: - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - project: 'sdc/sdc-workflow-designer' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-sdc-workflow-designer-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g - maven-version: 'mvn35' - +#- project: +# name: sdc-sdc-workflow-designer-arm64 +# project-name: 'sdc-sdc-workflow-designer-arm64' +# jobs: +# - '{project-name}-{stream}-docker-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# project: 'sdc/sdc-workflow-designer' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdc-sdc-workflow-designer-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g +# maven-version: 'mvn35' +# - project: name: sdc-sdc-workflow-designer-sonar jobs: @@ -55,7 +55,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-workflow-designer' project-name: 'sdc-sdc-workflow-designer' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-sdc-workflow-designer-settings' mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -69,5 +69,13 @@ project: sdc/sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' build-node: ubuntu1604-builder-4c-4g - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-sdc-workflow-designer-settings' + +- project: + name: sdc-sdc-workflow-designer-info + project-name: sdc-sdc-workflow-designer + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-workflow-designer + branch: master diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index cfdaad2f5..7d70a7e73 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -30,6 +30,7 @@ - '{project-name}-{stream}-verify-java': mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - '{project-name}-{stream}-sdc-merge-java': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' @@ -44,32 +45,32 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-8c-8g maven-version: 'mvn35' -- project: - name: sdc-arm64 - project-name: 'sdc-arm64' - jobs: - - '{project-name}-{stream}-docker-version-java-daily': - build-node: 'ubuntu1604-docker-arm64-4c-2g' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - project: 'sdc' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-settings' - files: '**' - archive-artifacts: '' - maven-version: 'mvn35' - +#- project: +# name: sdc-arm64 +# project-name: 'sdc-arm64' +# jobs: +# - '{project-name}-{stream}-docker-version-java-daily': +# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' +# project: 'sdc' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdc-settings' +# files: '**' +# archive-artifacts: '' +# maven-version: 'mvn35' +# - project: name: sdc-sonar jobs: @@ -78,7 +79,7 @@ build-node: ubuntu1604-builder-8c-8g project: 'sdc' project-name: 'sdc' - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-settings' mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' mvn-goals: 'clean install' @@ -95,5 +96,13 @@ project: sdc project-name: 'sdc' build-node: ubuntu1604-docker-8c-8g - branch: 'casablanca' + branch: 'dublin' mvn-settings: 'sdc-settings' + +- project: + name: sdc-info + project-name: sdc + jobs: + - gerrit-info-yaml-verify + project: sdc + branch: master diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index bfb97dfae..3cba3d94c 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -11,6 +11,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/apps' @@ -19,6 +20,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -57,27 +60,29 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdnc-apps-settings' files: '**' archive-artifacts: '' build-node: queue-docker-4c-4g - -- project: - name: sdnc-apps-docker-arm64 - project-name: 'sdnc-apps-arm64' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: 'sdnc/apps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-apps-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g +# +#- project: +# name: sdnc-apps-docker-arm64 +# project-name: 'sdnc-apps-arm64' +# jobs: +# - 'docker-version-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: 'sdnc/apps' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdnc-apps-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g - project: name: sdnc-apps-clm @@ -92,4 +97,14 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdnc-apps-settings' + +- project: + name: sdnc-apps-info + project-name: sdnc-apps + jobs: + - gerrit-info-yaml-verify + project: sdnc/apps + branch: master diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index dbbfb7c17..285f0f02a 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -8,10 +8,12 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' + - 'sdnc_netconf_tls_post_deploy': + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 190e0c2d6..32ed192f7 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/northbound' @@ -13,6 +14,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be @@ -50,4 +53,14 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdnc-northbound-settings' + +- project: + name: sdnc-northbound-info + project-name: sdnc-northbound + jobs: + - gerrit-info-yaml-verify + project: sdnc/northbound + branch: master diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 5bc66319f..f6eb04cd7 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -6,6 +6,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/oam' stream: @@ -13,6 +14,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' @@ -32,27 +35,29 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' build-node: queue-docker-4c-4g - -- project: - name: sdnc-oam-docker-arm64 - project-name: 'sdnc-oam-arm64' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: 'sdnc/oam' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-oam-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g +# +#- project: +# name: sdnc-oam-docker-arm64 +# project-name: 'sdnc-oam-arm64' +# jobs: +# - 'docker-version-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: 'sdnc/oam' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdnc-oam-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g - project: name: sdnc-oam-clm @@ -67,4 +72,14 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdnc-oam-settings' + +- project: + name: sdnc-oam-info + project-name: sdnc-oam + jobs: + - gerrit-info-yaml-verify + project: sdnc/oam + branch: master diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index b194d853a..47a8e7f01 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'integration-testing': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index faaeb60f9..f39545d26 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -10,8 +10,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'so-libs-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 @@ -43,3 +43,11 @@ project-name: 'so-libs' branch: 'master' mvn-settings: 'so-libs-settings' + +- project: + name: so-libs-info + project-name: so-libs + jobs: + - gerrit-info-yaml-verify + project: so/libs + branch: master diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 4d3e169c2..e69cb5b37 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' @@ -52,6 +52,14 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'so-settings' + +- project: + name: so-info + project-name: so + jobs: + - gerrit-info-yaml-verify + project: so + branch: master diff --git a/jjb/testsuite/testsuite-docker.sh b/jjb/testsuite/testsuite-docker.sh index d29d43c97..ca5e95aba 100644 --- a/jjb/testsuite/testsuite-docker.sh +++ b/jjb/testsuite/testsuite-docker.sh @@ -4,7 +4,11 @@ echo '============== CALLING SCRIPT TO CREATE DOCKER IMAGES =================' cp $WORKSPACE/docker/* . docker -D build -t onap/testsuite . export REPO="nexus3.onap.org:10003" -for tag in $tags + +DATETIME_STAMP=$(date +%Y%m%dT%H%M%S) +STAGING_TAG=${base_version}-STAGING-${DATETIME_STAMP}Z + +for tag in $tags $STAGING_TAG do docker tag onap/testsuite:latest $REPO/onap/testsuite:$tag docker push $REPO/onap/testsuite:$tag diff --git a/jjb/testsuite/testsuite-heatbridge-release.yaml b/jjb/testsuite/testsuite-heatbridge-release.yaml deleted file mode 100644 index cf46f1442..000000000 --- a/jjb/testsuite/testsuite-heatbridge-release.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- project: - name: testsuite-heatbridge-release - project-name: 'testsuite-heatbridge' - subproject: - - heatbridge: - path: '.' - pattern: '**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - project: 'testsuite/heatbridge' - - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'testsuite-heatbridge-settings' diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge.yaml similarity index 78% rename from jjb/testsuite/testsuite-heatbridge-master.yaml rename to jjb/testsuite/testsuite-heatbridge.yaml index 16ee0d90e..20ba913b7 100644 --- a/jjb/testsuite/testsuite-heatbridge-master.yaml +++ b/jjb/testsuite/testsuite-heatbridge.yaml @@ -13,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'testsuite-heatbridge-settings' files: '**' archive-artifacts: '' @@ -28,3 +30,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'testsuite-heatbridge-settings' + +- project: + name: testsuite-heatbridge-info + project-name: testsuite-heatbridge + jobs: + - gerrit-info-yaml-verify + project: testsuite/heatbridge + branch: master diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index 400170c21..db8c90c61 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -2,16 +2,43 @@ - project: name: testsuite-python-testing-utils project-name: 'testsuite-python-testing-utils' - subproject: - - python-testing-utils: - path: '.' - pattern: '**' + python-version: python2 jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - + - '{project-name}-{subproject}-python-staging-{stream}' + - '{project-name}-{subproject}-python-release-{stream}' project: 'testsuite/python-testing-utils' + subproject: + - 'robotframework-onap': + tox-dir: robotframework-onap/ + tox-envs: '' + + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'testsuite-python-testing-utils-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-builder-4c-4g' +- project: + name: testsuite-python-testing-utils-master-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: testsuite/python-testing-utils + project-name: 'testsuite-python-testing-utils' + build-node: 'ubuntu1604-builder-4c-4g' stream: - 'master': branch: 'master' mvn-settings: 'testsuite-python-testing-utils-settings' + +- project: + name: testsuite-python-testing-utils-info + project-name: testsuite-python-testing-utils + jobs: + - gerrit-info-yaml-verify + project: testsuite/python-testing-utils + branch: master diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index bc1aef22f..0b1e6cb14 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -16,13 +16,13 @@ project: 'testsuite' extra-project1: 'testsuite/python-testing-utils' - extra-branch1: 'master' - extra-refspec1: 'refs/heads/master' + extra-branch1: '{branch}' + extra-refspec1: 'refs/heads/{branch}' checkout-dir1: 'testsuite/eteutils' extra-project2: 'testsuite/heatbridge' - extra-branch2: 'master' - extra-refspec2: 'refs/heads/master' + extra-branch2: '{branch}' + extra-refspec2: 'refs/heads/{branch}' checkout-dir2: 'testsuite/heatbridge' extra-project3: 'demo' @@ -33,6 +33,14 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'testsuite-settings' + +- project: + name: testsuite-info + project-name: testsuite + jobs: + - gerrit-info-yaml-verify + project: testsuite + branch: master diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml index ee8effebc..ce90c4968 100644 --- a/jjb/usecases/5G-bulkpm.yaml +++ b/jjb/usecases/5G-bulkpm.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' - 'casablanca': branch: 'casablanca' functionality: diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index b97a5528d..e4b2850af 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -11,6 +11,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -44,3 +48,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-server-settings' + +- project: + name: usecase-ui-server-info + project-name: usecase-ui-server + jobs: + - gerrit-info-yaml-verify + project: usecase-ui/server + branch: master diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 0de519538..c4084bbef 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -16,6 +16,10 @@ 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-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -36,3 +40,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-settings' + +- project: + name: usecase-ui-info + project-name: usecase-ui + jobs: + - gerrit-info-yaml-verify + project: usecase-ui + branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index f4037920e..2442077ef 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -55,3 +55,11 @@ build-node: centos7-redis-4c-4g branch: 'master' mvn-settings: 'vfc-gvnfm-vnflcm-settings' + +- project: + name: vfc-gvnfm-vnflcm-info + project-name: vfc-gvnfm-vnflcm + jobs: + - gerrit-info-yaml-verify + project: vfc/gvnfm/vnflcm + branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 502dc4102..1264efda5 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -49,3 +49,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-gvnfm-vnfmgr-settings' + +- project: + name: vfc-gvnfm-vnfmgr-info + project-name: vfc-gvnfm-vnfmgr + jobs: + - gerrit-info-yaml-verify + project: vfc/gvnfm/vnfmgr + branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 8d444bea6..e9fa8fe5c 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -50,3 +50,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-gvnfm-vnfres-settings' + +- project: + name: vfc-gvnfm-vnfres-info + project-name: vfc-gvnfm-vnfres + jobs: + - gerrit-info-yaml-verify + project: vfc/gvnfm/vnfres + branch: master diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index b88633eb5..81b452742 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -50,3 +50,11 @@ build-node: centos7-redis-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-catalog-settings' + +- project: + name: vfc-nfvo-catalog-info + project-name: vfc-nfvo-catalog + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/catalog + branch: master diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 9e8570d5d..86f9e5cb2 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -19,3 +19,11 @@ !include-raw-escape: 'build-nfvo-db-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + +- project: + name: vfc-nfvo-db-info + project-name: vfc-nfvo-db + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/db + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 6b9abf76e..e2955519b 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -49,3 +49,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-ems-settings' + +- project: + name: vfc-nfvo-driver-ems-info + project-name: vfc-nfvo-driver-ems + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/ems + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 00fc285da..10ea310aa 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -49,3 +49,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-sfc-settings' + +- project: + name: vfc-nfvo-driver-sfc-info + project-name: vfc-nfvo-driver-sfc + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/sfc + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 8121f1b0c..46a0e3c1f 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -44,3 +44,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + +- project: + name: vfc-nfvo-driver-svnfm-huawei-info + project-name: vfc-nfvo-driver-svnfm-huawei + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/vnfm/svnfm + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index a4e53e55c..ac8c87e0f 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -50,3 +50,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' + +- project: + name: vfc-nfvo-driver-vnfm-gvnfm-info + project-name: vfc-nfvo-driver-vnfm-gvnfm + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/vnfm/gvnfm + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml deleted file mode 100644 index fcf552e6b..000000000 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokia - project-name: 'vfc-nfvo-driver-svnfm-nokia' - project: 'vfc/nfvo/driver/vnfm/svnfm' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - subproject: - - 'drv-vnfm-nokia': - pom: 'nokia/vnfmdriver/pom.xml' - pattern: 'nokia/vnfmdriver/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - mvn-params: '-f nokia/vnfmdriver/pom.xml' - build-node: ubuntu1604-builder-4c-4g - project: 'vfc/nfvo/driver/vnfm/svnfm' - project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia' - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokia-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f nokia/pom.xml' - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/driver/vnfm/svnfm - project-name: 'vfc-nfvo-driver-svnfm-nokia' - build-node: ubuntu1604-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml index a5cbe022d..1dd3cff8d 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml @@ -18,3 +18,11 @@ - '{project-name}-{stream}-release-version-profile-java-daily' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: vfc-nfvo-driver-svnfm-root-info + project-name: vfc-nfvo-driver-svnfm-root + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/vnfm/svnfm + branch: master diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index f209bbfc6..2805ea95f 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -44,3 +44,11 @@ build-node: centos7-redis-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-lcm-settings' + +- project: + name: vfc-nfvo-lcm-info + project-name: vfc-nfvo-lcm + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/lcm + branch: master diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml index b848b1f4e..935ffcaad 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml @@ -42,3 +42,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-multivimproxy-settings' + +- project: + name: vfc-nfvo-multivimproxy-info + project-name: vfc-nfvo-multivimproxy + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/multivimproxy + branch: master diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 4d54d0eb5..7ebfd06cf 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -42,3 +42,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-resmanagement-settings' + +- project: + name: vfc-nfvo-resmanagement-info + project-name: vfc-nfvo-resmanagement + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/resmanagement + branch: master diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 0e9bcf864..9664d08e9 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -65,3 +65,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-wfengine-settings' + +- project: + name: vfc-nfvo-wfengine-info + project-name: vfc-nfvo-wfengine + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/wfengine + branch: master diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index 04d653676..23afa74be 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -8,23 +8,21 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' functionality: - 'healthCheck': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' robot-options: '' -- project: - name: vid-csit-arm64 - jobs: - - '{project-name}-arm64-{stream}-verify-csit-{functionality}' - - '{project-name}-arm64-{stream}-csit-{functionality}' - project-name: 'vid' - stream: - - 'master': - branch: 'master' - functionality: - - 'healthCheck': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' - robot-options: '' +#- project: +# name: vid-csit-arm64 +# jobs: +# - '{project-name}-arm64-{stream}-verify-csit-{functionality}' +# - '{project-name}-arm64-{stream}-csit-{functionality}' +# project-name: 'vid' +# stream: +# - 'master': +# branch: 'master' +# functionality: +# - 'healthCheck': +# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' +# robot-options: '' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 54a680e1e..1380ed27e 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -11,14 +11,17 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: queue-docker-4c-4g + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-{stream}-release-version-java-daily': mvn-params: '-Dmaven.test.skip=true' project: 'vid' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' @@ -35,29 +38,27 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' build-node: queue-docker-4c-4g -- project: - name: vid-docker-arm64 - project-name: 'vid-arm64' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - project: 'vid' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vid-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: vid-docker-arm64 +# project-name: 'vid-arm64' +# jobs: +# - 'docker-version-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# project: 'vid' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'vid-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: vid-sonar jobs: @@ -70,6 +71,7 @@ mvn-settings: 'vid-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-params: '-Dskip.npm' - project: name: vid-clm @@ -81,3 +83,12 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vid-settings' + mvn-params: '-Dskip.npm' + +- project: + name: vid-info + project-name: vid + jobs: + - gerrit-info-yaml-verify + project: vid + branch: master diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml new file mode 100644 index 000000000..33a21d682 --- /dev/null +++ b/jjb/vnfrqts/build-and-upload.yaml @@ -0,0 +1,70 @@ +--- +- job-template: + # Job template for running a script to build an artifact and + # upload it to nexus as RAW artifacts. + # + + name: '{project-name}-{stream}-build-and-upload' + + pre_script: '' + post_script: '' + artifact_name: '' + project_id: '' + + project-type: freestyle + concurrent: true + node: '{build-node}' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + + scm: + - git: + credentials-id: '{jenkins-ssh-credential}' + url: '$GIT_BASE' + refspec: '' + choosing-strategy: 'default' + branches: + - 'refs/heads/{branch}' + skip-tag: true + wipe-workspace: true + submodule: + recursive: '{submodule-recursive}' + timeout: '24' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - timed: 'H H * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - lf-provide-maven-settings: + global-settings-file: '{mvn-global-settings}' + settings-file: '{mvn-settings}' + - shell: '{obj:pre_script}' + - lf-infra-create-netrc: + server-id: ecomp-raw + - inject: + properties-content: | + ARTIFACT_NAME={artifact_name} + PROJECT_ID={project_id} + - shell: '{obj:post_script}' + - lf-provide-maven-settings-cleanup + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' \ No newline at end of file diff --git a/jjb/vnfrqts/post-upload-artifact.sh b/jjb/vnfrqts/post-upload-artifact.sh new file mode 100644 index 000000000..588e49b04 --- /dev/null +++ b/jjb/vnfrqts/post-upload-artifact.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e -o pipefail +set -- $ARTIFACT_NAME +if [ -z "$ARTIFACT_NAME" ] +then + echo "ERROR NO ARTIFACTS ENTERED" +else + if [ -z "$2" ] + then + cd $WORKSPACE/docs/data + echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME" + curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME" + else + cd $WORKSPACE/ice_validator/output + echo "-n --upload-file $1 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1" + curl -n --upload-file "$1" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1" + echo "-n --upload-file $2 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2" + curl -n --upload-file "$2" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2" + fi +fi \ No newline at end of file diff --git a/jjb/vnfrqts/pre-build-needs.sh b/jjb/vnfrqts/pre-build-needs.sh new file mode 100644 index 000000000..da1d5e2d1 --- /dev/null +++ b/jjb/vnfrqts/pre-build-needs.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +virtualenv $WORKSPACE/venv-tox +source $WORKSPACE/venv-tox/bin/activate +pip install --upgrade pip +pip install -r etc/requirements.txt +ls +tox -e needs \ No newline at end of file diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml index e62095f83..7bb260e4b 100644 --- a/jjb/vnfrqts/vnfrqts-requirements.yaml +++ b/jjb/vnfrqts/vnfrqts-requirements.yaml @@ -7,3 +7,19 @@ project-name: 'vnfrqts-requirements' branch: 'master' mvn-settings: 'vnfrqts-requirements-settings' + +- project: + name: vnfrqts-requirements-upload-json + project: 'vnfrqts/requirements' + project-name: 'vnfrqts-requirements' + mvn-settings: 'vnfrqts-requirements-settings' + mvn-global-settings: 'global-settings' + stream: + - 'master': + branch: 'master' + jobs: + - '{project-name}-{stream}-build-and-upload': + pre_script: !include-raw-escape: pre-build-needs.sh + artifact_name: needs.json + project_id: org.onap.vnfrqts.requirements + post_script: !include-raw-escape: post-upload-artifact.sh diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 9f6a4068d..499bfae52 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -32,25 +32,25 @@ mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g -- project: - name: vnfsdk-dovetail-integration-arm64 - project-name: 'vnfsdk-dovetail-integration-arm64' - project: 'vnfsdk/dovetail-integration' - pom: 'pom.xml' - python-version: python2.7 - tox-dir: '.' - tox-envs: '' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vnfsdk-dovetail-integration-settings' - build-node: ubuntu1604-docker-arm64-4c-2g - jobs: - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - +#- project: +# name: vnfsdk-dovetail-integration-arm64 +# project-name: 'vnfsdk-dovetail-integration-arm64' +# project: 'vnfsdk/dovetail-integration' +# pom: 'pom.xml' +# python-version: python2.7 +# tox-dir: '.' +# tox-envs: '' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'vnfsdk-dovetail-integration-settings' +# build-node: ubuntu1604-docker-arm64-4c-2g +# jobs: +# - '{project-name}-{stream}-docker-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# - project: name: vnfsdk-dovetail-integration-tox-sonar jobs: diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml deleted file mode 100644 index a845ee113..000000000 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ /dev/null @@ -1,109 +0,0 @@ ---- -- project: - name: vnfsdk-ice - project-name: 'vnfsdk-ice' - project: 'vnfsdk/ice' - pom: 'pom.xml' - python-version: python3 - stream: - - 'master': - branch: 'master' - subproject: - - 'scripts': - path: 'validation-scripts' - pattern: 'validation-scripts/**' - pom: 'validation-scripts/pom.xml' - tox-dir: 'validation-scripts/' - tox-envs: '' - - 'server': - path: 'ice-server' - pattern: 'ice-server/**' - pom: 'ice-server/pom.xml' - tox-dir: 'ice-server/' - tox-envs: '' - mvn-settings: 'vnfsdk-ice-settings' - build-node: ubuntu1604-builder-4c-4g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{subproject}-python-staging-{stream}' - - '{project-name}-{subproject}-python-release-{stream}' - -- project: - name: vnfsdk-ice-docker - project-name: 'vnfsdk-ice-docker' - project: 'vnfsdk/ice' - pom: 'pom.xml' - stream: - - 'master': - branch: 'master' - subproject: - - 'docker': - path: 'docker' - pattern: 'docker/**' - pom: 'docker/pom.xml' - mvn-settings: 'vnfsdk-ice-settings' - build-node: ubuntu1604-builder-4c-4g - jobs: - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'docker/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - build-node: 'ubuntu1604-docker-8c-8g' - -- project: - name: vnfsdk-ice-docker-arm64 - project-name: 'vnfsdk-ice-docker-arm64' - project: 'vnfsdk/ice' - pom: 'pom.xml' - stream: - - 'master': - branch: 'master' - subproject: - - 'docker': - path: 'docker' - pattern: 'docker/**' - pom: 'docker/pom.xml' - mvn-settings: 'vnfsdk-ice-settings' - build-node: ubuntu1604-docker-arm64-4c-2g - jobs: - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'docker/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - -- project: - name: vnfsdk-ice-validation-scripts-tox-sonar - jobs: - - gerrit-tox-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'vnfsdk/ice' - project-name: 'vnfsdk-ice' - branch: 'master' - mvn-settings: 'vnfsdk-ice-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -- project: - name: vnfsdk-ice-info - jobs: - - gerrit-info-yaml-verify - project: 'vnfsdk/ice' - project-name: 'vnfsdk-ice' - branch: 'master' - mvn-settings: 'vnfsdk-ice-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vnfsdk-ice-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vnfsdk/ice - project-name: 'vnfsdk-ice' - build-node: ubuntu1604-builder-4c-4g - branch: 'master' - mvn-settings: 'vnfsdk-ice-settings' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index c1d2c6c3d..0724f6686 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -25,27 +25,27 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: vnfsdk-refrepo-arm64 - project-name: 'vnfsdk-refrepo-arm64' - jobs: - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' - mvn-goals: 'docker:build' - docker-image-name: 'onap/vnfsdk/refrepo' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: 'vnfsdk/refrepo' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vnfsdk-refrepo-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: vnfsdk-refrepo-arm64 +# project-name: 'vnfsdk-refrepo-arm64' +# jobs: +# - '{project-name}-{stream}-aai-docker-java-daily': +# pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' +# mvn-goals: 'docker:build' +# docker-image-name: 'onap/vnfsdk/refrepo' +# - '{project-name}-{stream}-docker-version-java-daily': +# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: 'vnfsdk/refrepo' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'vnfsdk-refrepo-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: vnfsdk-refrepo-sonar jobs: diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh new file mode 100644 index 000000000..b90f77b86 --- /dev/null +++ b/jjb/vvp/pre-build-csv.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +virtualenv -p python3 $WORKSPACE/venv-tox +source $WORKSPACE/venv-tox/bin/activate +pip3 install --upgrade pip +pip3 install --no-use-pep517 -r requirements.txt +ls +wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" +echo "Copied newest needs." +cd ice_validator/ +pytest --self-test tests/ \ No newline at end of file diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml deleted file mode 100644 index 24444c8a1..000000000 --- a/jjb/vvp/vvp-cms.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: vvp-project-view - project-name: vvp - views: - - project-view - -- project: - name: vvp-cms - project-name: 'vvp-cms' - project: 'vvp/cms' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-cms-settings' - build-node: ubuntu1604-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' - -- project: - name: vvp-cms-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-docker-8c-8g - project: 'vvp/cms' - project-name: 'vvp-cms' - branch: 'master' - mvn-settings: 'vvp-cms-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-devkit.yaml b/jjb/vvp/vvp-devkit.yaml deleted file mode 100644 index 5646b02de..000000000 --- a/jjb/vvp/vvp-devkit.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- - -- project: - name: vvp-devkit - project-name: 'vvp-devkit' - project: 'vvp/devkit' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-devkit-settings' - build-node: ubuntu1604-builder-4c-4g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - docker-pom: 'pom.xml' - mvn-profile: 'default' diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml index ca14d1682..338c79be9 100644 --- a/jjb/vvp/vvp-documentation.yaml +++ b/jjb/vvp/vvp-documentation.yaml @@ -3,11 +3,7 @@ name: vvp-documentation project-name: 'vvp-documentation' project: 'vvp/documentation' - rtdproject: 'onap' - stream: - - 'master': - branch: 'master' mvn-settings: 'vvp-documentation-settings' - build-node: ubuntu1604-builder-4c-4g + branch: master jobs: - - gerrit-tox-verify + - gerrit-info-yaml-verify diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml deleted file mode 100644 index 191909048..000000000 --- a/jjb/vvp/vvp-engagementmgr.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -- project: - name: vvp-engagementmgr - project-name: 'vvp-engagementmgr' - project: 'vvp/engagementmgr' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-engagementmgr-settings' - build-node: ubuntu1604-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' - -- project: - name: vvp-engagementmgr-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-docker-8c-8g - project: 'vvp/engagementmgr' - project-name: 'vvp-engagementmgr' - branch: 'master' - mvn-settings: 'vvp-engagementmgr-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml deleted file mode 100644 index 47c553ea6..000000000 --- a/jjb/vvp/vvp-gitlab.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-gitlab - project-name: 'vvp-gitlab' - project: 'vvp/gitlab' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-gitlab-settings' - build-node: ubuntu1604-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml deleted file mode 100644 index bdb7bda60..000000000 --- a/jjb/vvp/vvp-image-scanner.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -- project: - name: vvp-image-scanner - project-name: 'vvp-image-scanner' - project: 'vvp/image-scanner' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-image-scanner-settings' - build-node: ubuntu1604-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' - -- project: - name: vvp-image-scanner-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-docker-8c-8g - project: 'vvp/image-scanner' - project-name: 'vvp-image-scanner' - branch: 'master' - mvn-settings: 'vvp-image-scanner-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml deleted file mode 100644 index 8d46eba02..000000000 --- a/jjb/vvp/vvp-jenkins.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-jenkins - project-name: 'vvp-jenkins' - project: 'vvp/jenkins' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-jenkins-settings' - build-node: ubuntu1604-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml deleted file mode 100644 index 6a5015443..000000000 --- a/jjb/vvp/vvp-portal.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-portal - project-name: 'vvp-portal' - project: 'vvp/portal' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-portal-settings' - build-node: ubuntu1604-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml deleted file mode 100644 index 22b60efe8..000000000 --- a/jjb/vvp/vvp-postgresql.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-postgresql - project-name: 'vvp-postgresql' - project: 'vvp/postgresql' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-postgresql-settings' - build-node: ubuntu1604-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml deleted file mode 100644 index 8dd6cd9a4..000000000 --- a/jjb/vvp/vvp-test-engine.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-test-engine - project-name: 'vvp-engine' - project: 'vvp/test-engine' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-test-engine-settings' - build-node: ubuntu1604-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - docker-pom: 'pom.xml' - mvn-profile: 'default' diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index 94861bd75..943ea87ec 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -32,3 +32,19 @@ mvn-settings: 'vvp-validation-scripts-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vvp-validation-scripts-tracability-matrix + project: 'vvp/validation-scripts' + project-name: 'vvp-validation-scripts' + mvn-settings: 'vvp-validation-scripts-settings' + mvn-global-settings: 'global-settings' + stream: + - 'master': + branch: 'master' + jobs: + - '{project-name}-{stream}-build-and-upload': + pre_script: !include-raw-escape: pre-build-csv.sh + artifact_name: traceability.csv rst.csv + project_id: org.onap.vvp.validation-scripts + post_script: !include-raw-escape: ../vnfrqts/post-upload-artifact.sh diff --git a/jjb/wss-unified-agent.config b/jjb/wss-unified-agent.config new file mode 100644 index 000000000..4a9f091c7 --- /dev/null +++ b/jjb/wss-unified-agent.config @@ -0,0 +1,236 @@ +#################################################################### +# WhiteSource Unified-Agent configuration file +#################################################################### +########################################## +# GENERAL SCAN MODE: Files and Package Managers +########################################## + +checkPolicies=false +forceCheckAllDependencies=false +forceUpdate=false +forceUpdate.failBuildOnPolicyViolation=false +offline=false +#ignoreSourceFiles=true +#scanComment= +#updateInventory=false +#resolveAllDependencies=false +#failErrorLevel=ALL +#requireKnownSha1=false +#generateProjectDetailsJson=true +#generateScanReport=true +#scanReportTimeoutMinutes=10 +#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model + +#projectPerFolder=true +#projectPerFolderIncludes= +#projectPerFolderExcludes= + +#wss.connectionTimeoutMinutes=60 +# Change the below URL to your WhiteSource server. +# Use the 'WhiteSource Server URL' which can be retrieved +# from your 'Profile' page on the 'Server URLs' panel. +# Then, add the '/agent' path to it. +wss.url=https://saas.whitesourcesoftware.com/agent + +#npm.resolveDependencies=false +#npm.ignoreSourceFiles=false +#npm.includeDevDependencies=true +#npm.runPreStep=true +#npm.ignoreNpmLsErrors=true +#npm.ignoreScripts=true +#npm.yarnProject=true +#npm.accessToken= +#npm.identifyByNameAndVersion=true + +#bower.resolveDependencies=false +#bower.ignoreSourceFiles=true +#bower.runPreStep=true + +#nuget.resolvePackagesConfigFiles=false +#nuget.resolveCsProjFiles=false +#nuget.resolveDependencies=false +#nuget.restoreDependencies=true +#nuget.preferredEnvironment= +#nuget.packagesDirectory= +#nuget.ignoreSourceFiles=true +#nuget.runPreStep=true +#nuget.resolveNuspecFiles=false + +#python.resolveDependencies=false +#python.ignoreSourceFiles=false +#python.ignorePipInstallErrors=true +#python.installVirtualenv=true +#python.resolveHierarchyTree=false +#python.requirementsFileIncludes=requirements.txt +#python.resolveSetupPyFiles=true +#python.runPipenvPreStep=true +#python.pipenvDevDependencies=true +#python.IgnorePipenvInstallErrors=true + +#maven.ignoredScopes=test provided +#maven.resolveDependencies=false +#maven.ignoreSourceFiles=true +#maven.aggregateModules=true +#maven.ignorePomModules=false +#maven.runPreStep=true +#maven.ignoreMvnTreeErrors=true +#maven.environmentPath= +#maven.m2RepositoryPath= + +#gradle.ignoredScopes= +#gradle.resolveDependencies=false +#gradle.runAssembleCommand=false +#gradle.runPreStep=true +#gradle.ignoreSourceFiles=true +#gradle.aggregateModules=true +#gradle.preferredEnvironment=wrapper +#gradle.localRepositoryPath= + +#paket.resolveDependencies=false +#paket.ignoredGroups= +#paket.ignoreSourceFiles=false +#paket.runPreStep=true +#paket.exePath= + +#go.resolveDependencies=false +#go.collectDependenciesAtRuntime=true +#go.dependencyManager= +#go.ignoreSourceFiles=true +#go.glide.ignoreTestPackages=false +#go.gogradle.enableTaskAlias=true + +#ruby.resolveDependencies = false +#ruby.ignoreSourceFiles = false +#ruby.installMissingGems = true +#ruby.runBundleInstall = true +#ruby.overwriteGemFile = true + +#sbt.resolveDependencies=false +#sbt.ignoreSourceFiles=true +#sbt.aggregateModules=true +#sbt.runPreStep=true +#sbt.targetFolder= + +#php.resolveDependencies=false +#php.runPreStep=true +#php.includeDevDependencies=true + +#html.resolveDependencies=false + +#cocoapods.resolveDependencies=false +#cocoapods.runPreStep=true +#cocoapods.ignoreSourceFiles=false + +#hex.resolveDependencies=false +#hex.runPreStep=true +#hex.ignoreSourceFiles=false +#hex.aggregateModules=true + +################################## +# Organization tokens: +################################## +apiKey= + +#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option +#userKey= + +projectName= +projectVersion= +projectToken= + +productName= +productVersion= +productToken= +#updateType=APPEND +#requesterEmail=user@provider.com + +######################################################################################### +# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE +######################################################################################### +includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx **/*.go **/*.py + +#includes=**/*.m **/*.mm **/*.js **/*.php +#includes=**/*.jar +#includes=**/*.gem **/*.rb +#includes=**/*.dll **/*.cs **/*.nupkg +#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2 +#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py + +## Exclude file extensions or specific directories by adding **/*. or **/** +excludes=**/*sources.jar **/*javadoc.jar + +case.sensitive.glob=false +followSymbolicLinks=true + +################################## +# Archive properties +################################## +#archiveExtractionDepth=2 +#archiveIncludes=**/*.war **/*.ear +#archiveExcludes=**/*sources.jar + +################################## +# Proxy settings +################################## +#proxy.host= +#proxy.port= +#proxy.user= +#proxy.pass= + +################################## +# SCM settings +################################## +#scm.type= +#scm.user= +#scm.pass= +#scm.ppk= +#scm.url= +#scm.branch= +#scm.tag= +#scm.npmInstall= +#scm.npmInstallTimeoutMinutes= +#scm.repositoriesFile= + +############################################## +# SCAN MODE: Linux package manager settings +############################################## +#scanPackageManager=true + +################################## +# SCAN MODE: Docker images +################################## +#docker.scanImages=true +#docker.includes=.*.* +#docker.excludes= +#docker.pull.enable=true +#docker.pull.images=.*.* +#docker.pull.maxImages=10 +#docker.pull.tags=.*.* +#docker.pull.digest= +#docker.delete.force=true +#docker.login.sudo=false + +#docker.aws.enable=true +#docker.aws.registryIds= + +#docker.azure.enable=true +#docker.azure.userName= +#docker.azure.userPassword= +#docker.azure.registryNames= + +################################## +# SCAN MODE: Docker containers +################################## +#docker.scanContainers=true +#docker.containerIncludes=.*.* +#docker.containerExcludes= + +################################ +# Serverless settings +################################ +#serverless.provider= +#serverless.scanFunctions=true +#serverless.includes= +#serverless.excludes= +#serverless.region= +#serverless.maxFunctions=10 diff --git a/packer/provision/basebuild/.dummy b/packer/provision/basebuild/.dummy deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index bc7c19bc0..f3af6218e 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -9,10 +9,21 @@ docker_compose_version: 1.17.1 glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c glide_version: v0.13.1 - golang_checksum: sha256:07d81c6b6b4c2dcf1b5ef7c27aaebd3691cdb40548500941f92b221147c5d9c7 golang_version: 1.9.1 tasks: + - name: "Checking for x86_64" + set_fact: + host_arch: "amd64" + golang_checksum: sha256:07d81c6b6b4c2dcf1b5ef7c27aaebd3691cdb40548500941f92b221147c5d9c7 + when: "'x86_64' in ansible_architecture" + + - name: "Checking for aarch64" + set_fact: + host_arch: "arm64" + golang_checksum: sha256:d31ecae36efea5197af271ccce86ccc2baf10d2e04f20d0fb75556ecf0614dad + when: "'aarch64' in ansible_architecture" + - name: 'Install Docker Compose {{docker_compose_version}}' command: curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/{{docker_compose_version}}/docker-compose-Linux-x86_64" become: true @@ -24,14 +35,14 @@ - name: 'Install GoLang {{golang_version}}' block: - - name: 'Fetch golang {{golang_version}} to /tmp/go{{golang_version}}.linux-amd64.tar.gz' + - name: 'Fetch golang {{golang_version}} to /tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz' get_url: - url: 'https://storage.googleapis.com/golang/go{{golang_version}}.linux-amd64.tar.gz' - dest: '/tmp/go{{golang_version}}.linux-amd64.tar.gz' + url: 'https://storage.googleapis.com/golang/go{{golang_version}}.linux-{{host_arch}}.tar.gz' + dest: '/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz' checksum: '{{golang_checksum}}' - name: 'Install golang {{golang_version}} to /usr/local' unarchive: - src: '/tmp/go{{golang_version}}.linux-amd64.tar.gz' + src: '/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz' dest: /usr/local remote_src: true become: true @@ -47,10 +58,11 @@ name: libxml2-utils state: present become: true + when: ansible_distribution == 'Ubuntu' - name: Install python-tox - apt: - name: python-tox + pip: + name: tox state: present become: true @@ -58,12 +70,14 @@ repo: ppa:jonathonf/python-3.6 state: present become: true + when: ansible_distribution == 'Ubuntu' - name: Update and upgrade apt packages apt: upgrade: yes update_cache: yes become: true + when: ansible_distribution == 'Ubuntu' - name: Install Python 3.6 and packages apt: @@ -74,6 +88,7 @@ - libmysqlclient-dev - gcc become: true + when: ansible_distribution == 'Ubuntu' - name: Install base packages apt: @@ -89,6 +104,7 @@ - libssl-dev - libffi-dev become: true + when: ansible_distribution == 'Ubuntu' - name: Install autorelease support packages apt: @@ -99,29 +115,31 @@ - maven - python-ncclient become: true + when: ansible_distribution == 'Ubuntu' - name: Add Google Chrome key apt_key: url: https://dl-ssl.google.com/linux/linux_signing_key.pub state: present become: true - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Add Google Chrome repo copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644 become: true - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Update apt cache apt: update_cache=yes become: true + when: ansible_distribution == 'Ubuntu' - name: Install Google Chrome apt: name: google-chrome-stable state: present become: true - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Install Erlang dependency packages apt: @@ -130,26 +148,26 @@ - libsctp1 - libwxbase3.0-0v5 become: true - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Install Erlang apt: deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb install_recommends: yes become: true - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Clone rebar3 git: repo: 'https://github.com/erlang/rebar3.git' dest: /tmp/rebar3 - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Bootstrap rebar3 command: ./bootstrap args: chdir: /tmp/rebar3 - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Install rebar3 to bin copy: @@ -158,13 +176,13 @@ mode: 0755 remote_src: true become: true - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Remove unused rebar3 source file: path: /tmp/rebar3 state: absent - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Download geckodriver unarchive: @@ -173,7 +191,7 @@ mode: 0755 remote_src: yes become: true - when: "'x86_64' in ansible_architecture" + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Download Firefox version 55.0.3 unarchive: @@ -181,13 +199,13 @@ dest: /opt mode: 0755 remote_src: yes - when: "'x86_64' in ansible_architecture" become: true + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Create symbolic link to firefox bin file: src: "/opt/firefox/firefox" dest: "/usr/bin/firefox" state: link - when: "'x86_64' in ansible_architecture" become: true + when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' diff --git a/shell/apply-submodule-patch-oom.sh b/shell/apply-submodule-patch-oom.sh new file mode 100644 index 000000000..ad818fb80 --- /dev/null +++ b/shell/apply-submodule-patch-oom.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 2019 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## + +# Update kubernetes submodule under oom with patch to be verified + +echo '--> apply-submodule-patch-oom.sh' +cd kubernetes/${HELM_MODULE} +remote_path=`git remote -v | grep fetch | awk '{print $2}'` +git fetch ${remote_path} $GERRIT_REFSPEC && git cherry-pick FETCH_HEAD +cd ../..