From: Jessica Wagantall Date: Mon, 1 Jul 2019 17:30:24 +0000 (+0000) Subject: Merge "Migrate to gerrit-maven-stage (MSB)" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=63306166fa492a8e37429b9cf12773cb5184ae17;hp=974de8a8abc98fb5b4a61bfc8ff71b547bcbf4cd;p=ci-management.git Merge "Migrate to gerrit-maven-stage (MSB)" --- diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index abdc7c73c..1ec847026 100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -6,7 +6,7 @@ that can be used before pushing job templates to the production It is configured similar to the ONAP [ci-management] production instance; however, it cannot publish artifacts or vote in Gerrit. Be aware that this is a -test environment, and as such there a limited allotment of minions to test on +test environment, and as such there is a limited allotment of minions to test on before pushing code to the ONAP repos. Keep the following points in mind prior to beginning work on ONAP Jenkins Sandbox environment: @@ -19,11 +19,12 @@ environment: these VMs directly. Before you proceed further, ensure you have a Linux Foundation ID (LFID), which is -required to access Gerrit & Jenkins. Also, to get an access to Sandbox environment -please send email to helpdesk@onap.org (LF helpdesk team) +required to access Gerrit & Jenkins. Also, to extend your permissions for uploading +Jenkins configurations to Sandbox environment, you must raise a ticket to +[Linux Foundation Help Center](https://support.linuxfoundation.org) To download **ci-management**, execute the following command to clone the -**ci-managment** repository. +**ci-management** repository. `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; \ @@ -48,28 +49,28 @@ jenkins-jobs --version jenkins-jobs test --recursive jjb/ ``` -### Make a copy of the example JJB config file (in the builder/ directory) +### Make a copy of the example JJB config file (in the ci-management/ directory) Backup the jenkins.ini.example to 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** +**Jenkins LFID username** and **API token** ``` [job_builder] ignore_cache=True keep_descriptions=False -include_path=.:scripts:~/git/ +include_path=. recursive=True +retain_anchors=True [jenkins] user=jwagantall password= url=https://jenkins.onap.org/sandbox -This is deprecated, use job_builder section instead -ignore_cache=True +query_plugins_info=False ``` ### How to retrieve API token? Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user @@ -77,7 +78,7 @@ page by clicking on your username. Click **Configure** and then click **Add new 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 +To work on existing jobs or create new jobs, navigate to the `ci-management/jjb/` directory where you will find all job templates for the project. Follow the below commands to test, update or delete jobs in your sandbox environment. @@ -105,7 +106,7 @@ The output directory will contain files with the XML configurations. ## To Update a job: -Ensure you’ve configured your `jenkins.ini` and verified it by +Ensure you’ve configured your `jenkins_jobs.ini` and verified it by outputting valid XML descriptions of Jenkins jobs. Upon successful verification, execute the following command to update the job to the Jenkins sandbox. @@ -114,6 +115,9 @@ Jenkins sandbox. **Example:** `jenkins-jobs update jjb/ sdc-master-verify-java` +Note that there will be some 403 errors along the way for failed view creation attempts even +when the job creation succeeds. + ## Trigger jobs from Jenkins Sandbox: Once you push the Jenkins job configuration to the ONAP Sandbox environment, diff --git a/global-jjb b/global-jjb index bfea76c9b..ceaa770ac 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit bfea76c9bead88faf10a3ad41ae98ad741ac1b91 +Subproject commit ceaa770aceb35242840d2718a0f8664143a8835f diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index 41440ff0a..1bd5189d2 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180328-1726 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344 LABELS=centos7-builder-2c-1g HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg index dbabd5f29..1fea53c10 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180328-1726 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344 LABELS=centos7-builder-4c-4g HARDWARE_ID=v2-highcpu-4 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..33e096f48 --- /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 - 20190610-221311.883 +LABELS=centos7-docker-8c-8g +HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg index 975b7494f..b8b74a824 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=CentOS 7 - redis - 20180805-2225 +IMAGE_NAME=CentOS 7 - redis - - 100680606-6010 LABELS=centos7-redis-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg index 22bc7c4d4..b3c72a265 100644 --- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575 LABELS=queue-docker-4c-4g HARDWARE_ID=v2-highcpu-4 INSTANCE_CAP=1 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg index b000ff6ce..29b2cd044 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 LABELS=ubuntu1604-builder-2c-1g HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg index 5bff88e70..8780f9537 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 LABELS=ubuntu1604-builder-4c-2g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg index 30a7bcda7..a01f33692 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 LABELS=ubuntu1604-builder-8c-8g HARDWARE_ID=v2-highcpu-8 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 db219ca50..637bf61d9 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 - 20190123-052615.439 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575 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 index a3bdd73ff..c1d860e2b 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-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 - 20190510-225520.575 LABELS=ubuntu1604-docker-8c-8g HARDWARE_ID=v1-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg index f5b09e54c..81f53c8c8 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - 20180807-1251 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - - 20190607-124834.118 LABELS=ubuntu1604-helm-2c-1g HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg index 26bcf360f..ce1244fdb 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=Ubuntu 16.04 - memcached - 20171102-0135 +IMAGE_NAME=Ubuntu 16.04 - memcached - - 170580505-5004 LABELS=ubuntu1604-memcached-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 4cb73592a..11e33c571 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.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-docker-8c-8g + maven-versions-plugin: true - '{project-name}-{stream}-docker-java-shell-daily': mvn-goals: 'clean install' settings: '{mvn-settings}' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index a605a811c..7d61e587f 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.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-docker-8c-8g + maven-versions-plugin: true project: 'aaf/cadi' stream: - 'master': diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml index 634189213..999fc0346 100644 --- a/jjb/aaf/aaf-sms.yaml +++ b/jjb/aaf/aaf-sms.yaml @@ -8,9 +8,12 @@ jobs: - '{project-name}-{stream}-verify-golang' - '{project-name}-{stream}-merge-golang' - - '{project-name}-{stream}-{subproject}-release-version-java-daily': - pom: - 'sms-client/java/pom.xml' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-pom: 'sms-client/java/pom.xml' + mvn-params: '-f sms-client/java/pom.xml' - '{project-name}-{stream}-docker-golang-shell-daily': script: !include-raw-escape: 'build-sms-docker-image.sh' diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml index 6e4ab2e8b..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: diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 1f5d8cc0e..2a6b9a24a 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -12,12 +12,16 @@ - '{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: 'aai/aai-common' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: '**' @@ -47,8 +51,8 @@ project: 'aai/aai-common' project-name: 'aai-aai-common' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 624548971..dfda527de 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -11,15 +11,20 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'aai/babel' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-babel-settings' @@ -48,8 +53,8 @@ project: 'aai/babel' project-name: 'aai-babel' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-babel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index fde02ce9d..3dc5d77fe 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: '**' @@ -45,8 +45,8 @@ project: 'aai/cacher' project-name: 'aai-cacher' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index dbb60b908..a0bd8f3be 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,8 +35,8 @@ project: 'aai/chameleon' project-name: 'aai-chameleon' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-chameleon-settings' - project: diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index 59d95804c..e583e85d5 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: '' @@ -48,8 +48,8 @@ project: 'aai/champ' project-name: 'aai-champ' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-champ-settings' - project: diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index eb7f5bbba..fa6dea7f0 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' @@ -47,8 +47,8 @@ project: 'aai/data-router' project-name: 'aai-data-router' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-data-router-settings' - project: diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 583e3215a..a2920fee5 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,8 +36,8 @@ project: 'aai/esr-gui' project-name: 'aai-esr-gui' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-esr-gui-settings' - project: diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 250969c3a..5cee139eb 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,8 +49,8 @@ project: 'aai/esr-server' project-name: 'aai-esr-server' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-esr-server-settings' - project: diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 3ba2992cf..5b8efe5cd 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,8 +43,8 @@ project: 'aai/event-client' project-name: 'aai-event-client' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-event-client-settings' - project: diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index 3f79530f9..ef82b0c4c 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,8 +28,8 @@ project: 'aai/gallifrey' project-name: 'aai-gallifrey' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-gallifrey-settings' - project: diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index 530def226..2f2c88122 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' @@ -48,8 +48,8 @@ project: 'aai/gizmo' project-name: 'aai-gizmo' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-gizmo-settings' - project: diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index efab1a84e..e44d76957 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: '**' @@ -51,8 +51,8 @@ project: 'aai/graphadmin' project-name: 'aai-graphadmin' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index b1b4c7a42..278b1ee2b 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-8c-8g + project: 'aai/graphgraph' stream: - 'master': diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 53fe21c59..b4383aad2 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,8 +43,8 @@ project: 'aai/logging-service' project-name: 'aai-logging-service' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-logging-service-settings' - project: diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index a459e5099..e52577268 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' @@ -48,8 +48,8 @@ project: 'aai/model-loader' project-name: 'aai-model-loader' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-model-loader-settings' - project: diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index 816ecff2e..f8a061211 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -19,6 +19,9 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'aai-oom-settings' files: '**' archive-artifacts: '' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 787b45398..d5d5c2a7f 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: '**' @@ -51,8 +51,8 @@ project: 'aai/resources' project-name: 'aai-resources' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index bbb157496..3136efedb 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,8 +43,8 @@ project: 'aai/rest-client' project-name: 'aai-rest-client' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-rest-client-settings' - project: diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index e4d0745e7..2816f3f9e 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,8 +43,8 @@ project: 'aai/router-core' project-name: 'aai-router-core' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-router-core-settings' - project: diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 020372972..20aea9375 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -11,12 +11,16 @@ 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: 'aai-schema-service/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'aai/schema-service' stream: - 'master': @@ -49,8 +53,8 @@ project: 'aai/schema-service' project-name: 'aai-schema-service' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-schema-service-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index fddc4daea..e5ae2e686 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -19,8 +19,8 @@ project: 'aai/search-data-service' docker-image-name: 'onap/search-data-service' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' - 'master': branch: 'master' mvn-settings: 'aai-search-data-service-settings' @@ -65,8 +65,8 @@ project: 'aai/search-data-service' project-name: 'aai-search-data-service' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-search-data-service-settings' - project: diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 4b3bc4440..be35736fd 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' @@ -47,8 +47,8 @@ project: 'aai/sparky-be' project-name: 'aai-sparky-be' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-sparky-be-settings' - project: diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 596eeaffe..c75d5bf49 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -9,8 +9,8 @@ - '{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' diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index ca8d5858f..663240d72 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' @@ -47,8 +47,8 @@ project: 'aai/spike' project-name: 'aai-spike' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-spike-settings' - project: diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 9927db52f..8c64aa0fd 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: '**' @@ -51,8 +51,8 @@ project: 'aai/traversal' project-name: 'aai-traversal' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index a5dd70b81..c740de7e0 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' @@ -48,8 +48,8 @@ project: 'aai/validation' project-name: 'aai-validation' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'aai-validation-settings' diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml index bcd0c822d..d66a9025c 100644 --- a/jjb/appc/appc-cdt.yaml +++ b/jjb/appc/appc-cdt.yaml @@ -5,8 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage - - '{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: diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index 0289ee4e6..220e3cf46 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -6,7 +6,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - 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' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 56ce45ba9..71e370009 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -7,7 +7,10 @@ build-node: ubuntu1604-builder-8c-8g - '{project-name}-{stream}-merge-java': build-node: ubuntu1604-builder-8c-8g - - gerrit-maven-stage + - 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 diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index 032b8fd49..efb25d02e 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -11,8 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage - - '{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: diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 9ee4277e5..699585040 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -20,8 +20,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' @@ -57,8 +55,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' @@ -74,8 +70,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index c97d1936b..40d7500aa 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' functionality: diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index ce8015e13..ebadb2a92 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -13,8 +13,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' @@ -34,8 +32,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' @@ -72,8 +68,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' @@ -87,3 +81,14 @@ - gerrit-info-yaml-verify project: ccsdk/distribution branch: master + +- project: + name: ccsdk-distribution-whitesource + project-name: ccsdk-distribution + jobs: + - gerrit-whitesource-scan + mvn-settings: 'ccsdk-distribution-settings' + wss-product-name: ccsdk + mvn-clean-install: true + project: ccsdk/distribution + branch: master diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 3950c9869..a9ef4b494 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-features-settings' @@ -51,8 +49,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-features-settings' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index c0d576b84..bdfa9a333 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-parent-settings' @@ -37,8 +35,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-parent-settings' diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index b024a7a76..a375204d4 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-platform-plugins-settings' @@ -51,8 +49,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-platform-plugins-settings' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 1b3237f98..cbc35eae6 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-adaptors-settings' @@ -51,8 +49,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-adaptors-settings' diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index a3feadd15..3f17f54dc 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-core-settings' @@ -51,8 +49,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-core-settings' diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 66c753b0b..73b9a125b 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-northbound-settings' @@ -51,8 +49,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-northbound-settings' diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 290cb9b90..81efcaf6a 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-plugins-settings' @@ -50,8 +48,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-plugins-settings' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 5c5e31633..3d0651c96 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-utils-settings' @@ -37,8 +35,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-utils-settings' diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml new file mode 100644 index 000000000..83bdffc30 --- /dev/null +++ b/jjb/ci-management/ci-management-coverity.yaml @@ -0,0 +1,117 @@ +--- +# Coverity Scan static analysis + +- job-template: + name: '{project-name}-coverity' + id: onap-gerrit-maven-coverity + description: > +
+

How to access Coverity Scan static analysis results

+
    +
  1. Visit Coverity Scan + project page.
    2. +
  2. If you have not been added to the project on Coverity Scan service yet: +
      +
    1. Click on + Add me to project.
      2. +
    2. Wait till the project administrators grant you appropriate permissions.
      3. +
    +
  3. Click on + View Defects.
    4. +
+

Please note that processing data takes some time. You will get an email when it's done.

+
+ + project-type: freestyle + node: '{build-node}' + branch: master + build-days-to-keep: 7 + build-timeout: 60 + cron: '@daily' + disabled: false + git-url: '$GIT_URL/$PROJECT' + java-version: openjdk8 + mvn-global-settings: global-settings + mvn-opts: '' + mvn-params: '' + mvn-version: mvn35 + coverity-project-name: '' + coverity-token: '' + coverity-user-email: '' + coverity-search-paths: '' + coverity-search-exclude-regexs: '' + stream: master + submodule-recursive: true + submodule-timeout: 10 + submodule-disable: false + archive-artifacts: > + **/*.log + **/*-log.txt + **/hs_err_*.log + **/target/**/feature.xml + **/target/failsafe-reports/failsafe-summary.xml + **/target/surefire-reports/*-output.txt + **/cov-int/BUILD.metrics.xml + **/cov-int/build-timings.txt + **/cov-int/java-security-da-whitelist.dat + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - lf-infra-parameters: + project: '{project}' + branch: '{branch}' + stream: '{stream}' + - lf-infra-maven-parameters: + mvn-opts: '{mvn-opts}' + mvn-params: '{mvn-params}' + mvn-version: '{mvn-version}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + + triggers: + - timed: '{obj:cron}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + builders: + - lf-infra-pre-build + - lf-maven-install: + mvn-version: '{mvn-version}' + - lf-update-java-alternatives: + java-version: '{java-version}' + - lf-provide-maven-settings: + global-settings-file: global-settings + settings-file: '{mvn-settings}' + - inject: + properties-content: | + COVERITY_PROJECT_NAME={coverity-project-name} + COVERITY_TOKEN={coverity-token} + COVERITY_USER_EMAIL={coverity-user-email} + SEARCH_PATHS={coverity-search-paths} + SEARCH_EXCLUDE_REGEXS={coverity-search-exclude-regexs} + - shell: !include-raw-escape: + - ../../global-jjb/shell/common-variables.sh + - ../../shell/maven-coverity.sh + - lf-provide-maven-settings-cleanup + + publishers: + - lf-infra-publish + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' + refspec: $GERRIT_REFSPEC + branch: $GERRIT_BRANCH + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' + choosing-strategy: default diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index f4f46f3ca..44b80be66 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -32,6 +32,7 @@ build-timeout: 90 platforms: + - centos-7 - ubuntu-16.04 - ubuntu-16.04-arm64 templates: docker @@ -82,7 +83,6 @@ build-node: centos7-builder-2c-1g platforms: - - centos-7 - ubuntu-16.04 templates: helm diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml index 8915a2caa..91ca7b066 100644 --- a/jjb/ci-management/ci-management-views.yaml +++ b/jjb/ci-management/ci-management-views.yaml @@ -46,6 +46,14 @@ view-regex: '^(?=.*-sonar)(?!.*-no-sonar).*' view-description: 'List of Sonar jobs' +- project: + name: All-Coverity + views: + - common-view + view-name: All-Coverity + view-regex: '.*-coverity' + view-description: 'List of Coverity jobs' + - view: name: CLM description: 'List of CLM jobs' @@ -119,3 +127,11 @@ view-name: Verify-Jobs view-description: 'List of Verify jobs' view-regex: '^.*-verify-.*' + +- project: + name: WhiteSource + views: + - common-view + view-name: WhiteSource + view-description: 'List of WhiteSource jobs' + view-regex: '.*-whitesource-.*' diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index d069aa59f..3c2579301 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'APIs': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index b941a2c3d..901d84474 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -9,30 +9,28 @@ name: clamp project-name: 'clamp' jobs: + - gerrit-maven-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-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 -P docker' - '{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' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - maven-properties: | - clamp.registry=$ project: 'clamp' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'clamp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 418ca6559..dde942d15 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -11,6 +11,18 @@ 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 + - gerrit-maven-docker-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-f deployment/docker/pom.xml' + mvn-pom: 'deployment/docker/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'deployment/docker/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml index fc3522d70..d32d4b91f 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.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' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml index 749d01e41..710850355 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - '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 a328fd60d..3a574a504 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' # apply to all jobs project: 'dcaegen2/collectors/hv-ves' mvn-settings: 'dcaegen2-collectors-hv-ves-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 44faf9b17..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 diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 0ef35e629..79dab04c5 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - '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 diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index eb7a8fdef..d7bc96472 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - '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 diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index f1943d43d..5dee64645 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - '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 diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 6d35e186b..285d4e0ee 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - '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 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..5a75199d2 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml @@ -0,0 +1,31 @@ +--- +- 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' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + version-properties-file: 'blueprint-generator/version.properties' + mvn-pom: 'blueprint-generator/pom.xml' + mvn-params: '-f blueprint-generator/pom.xml' + pattern: 'blueprint-generator/**' + 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-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 4b161fbc1..8f753b4a3 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - '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 diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 8f2c351c7..b6bb261d6 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - '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 diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 385274b39..d33b745b0 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - '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 diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 489cb013e..3d7e40ee2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -19,14 +19,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'centos7-redis-4c-4g' - project: name: dcaegen2-platform-plugins-sonar jobs: - gerrit-maven-sonar cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: centos7-redis-4c-4g project: 'dcaegen2/platform/plugins' project-name: 'dcaegen2-platform-plugins' branch: 'master' @@ -40,7 +40,7 @@ - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: dcaegen2/platform/plugins - build-node: ubuntu1604-docker-8c-8g + build-node: centos7-redis-4c-4g project-name: 'dcaegen2-platform-plugins' branch: 'master' mvn-settings: 'dcaegen2-platform-plugins-settings' @@ -52,3 +52,26 @@ - gerrit-info-yaml-verify project: dcaegen2/platform/plugins branch: master + +#job added to retain dublin plugin build under ubuntu +- project: + name: dcaegen2-platform-plugins-dublin + project-name: 'dcaegen2-platform-plugins' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform/plugins' + stream: + - '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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index a93fd571b..cb19425a6 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - '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 diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index a91af7a9b..a810feae2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -11,6 +11,15 @@ # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: centos7-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build -DpushImage' project: 'dcaegen2/platform/servicechange-handler' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml index 559370c57..94e7e2e1a 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml @@ -7,8 +7,10 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' functionality: - 'bbs-testsuites': trigger_jobs: - - 'dcaegen2-services-master-bbs-event-processor-merge-java' + - '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 index 670cbd844..2e49ee55a 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -6,7 +6,8 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - '{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' @@ -14,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 2d8973637..1c5ad804f 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -6,7 +6,8 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily': + version-properties: 'components/datalake-handler/version.properties' subproject: - 'datalake-handler': pom: 'components/datalake-handler/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index ff7f9ae73..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 diff --git a/jjb/dcaegen2/dcaegen2-services-java.yaml b/jjb/dcaegen2/dcaegen2-services-java.yaml index dc0475994..525a9fa38 100644 --- a/jjb/dcaegen2/dcaegen2-services-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-java.yaml @@ -4,7 +4,7 @@ jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - build-node: ubuntu1604-docker-4c-4g + build-node: ubuntu1604-docker-8c-8g project: 'dcaegen2/services' project-name: 'dcaegen2-services' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index c5fc0d476..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: '' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 70302c114..7f9c4da68 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,6 +6,10 @@ stream: - 'master': branch: 'master' + mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version' + - 'dublin': + branch: 'dublin' + mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-version' # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' @@ -21,7 +25,6 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version' script: '/bin/true' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml index 38216d1e8..1d4bcf2e5 100644 --- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml @@ -4,7 +4,12 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'dcaegen2-pmmapper' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + functionality: - 'pmmapper': trigger_jobs: diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index b49c36082..8e3047f7e 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-services-prh-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 1c9187072..a3424473d 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -6,11 +6,17 @@ - '{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: 'dcaegen2/services/sdk' stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-services-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index 0e637f36a..b4d2b5c5b 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dcaegen2-services-son-handler-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 4e579b65e..d91b3789c 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -13,6 +13,8 @@ stream: - 'master': branch: 'master' + - '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 diff --git a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml index 2d11c7fbd..4c610e167 100644 --- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' functionality: - 'testsuites' trigger_jobs: @@ -21,6 +23,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' functionality: - 'prh-testsuites' trigger_jobs: diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 9987f577c..38e683d86 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -17,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' 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 diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index f40d7ab0c..d86624790 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -11,12 +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' + - 'dublin': + branch: 'dublin' mvn-settings: 'demo-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 2420436b6..f43e43ac9 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -21,6 +21,15 @@ # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package -P docker docker:build -DpushImage' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/buscontroller' stream: diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml index e1cabcfb1..f01af31cd 100644 --- a/jjb/dmaap/dmaap-datarouter-csit.yaml +++ b/jjb/dmaap/dmaap-datarouter-csit.yaml @@ -10,6 +10,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'dr-suite': trigger_jobs: @@ -25,6 +27,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' functionality: - 'ssl-dr-suite': trigger_jobs: diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index ac8aade16..ba7cb67be 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -14,11 +14,22 @@ # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package -P docker docker:build -DpushImage' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/datarouter' stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'dmaap-datarouter-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 5fd25b992..fd4ca6a7c 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -6,6 +6,11 @@ - '{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: 'dmaap/dbcapi' mvn-settings: 'dmaap-dbcapi-settings' stream: diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml index b6a9ac75c..ba433f7c8 100644 --- a/jjb/dmaap/dmaap-kafka-docker.yaml +++ b/jjb/dmaap/dmaap-kafka-docker.yaml @@ -8,6 +8,12 @@ mvn-params: '-Dmaven.test.skip=true' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-goals: '-Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/kafka11aaf' stream: - 'master': diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml index 7b1573ce3..85c5f746b 100644 --- a/jjb/dmaap/dmaap-kafka.yaml +++ b/jjb/dmaap/dmaap-kafka.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-docker-8c-8g + maven-versions-plugin: true project: 'dmaap/kafka11aaf' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index b5db723bc..bc171cbe1 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -6,6 +6,11 @@ - '{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: 'dmaap/messagerouter/dmaapclient' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index f2cf27a2b..30d68665a 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -8,6 +8,12 @@ mvn-params: '-Dmaven.test.skip=true' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: '-Dmaven.test.skip=true' + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/messagerouter/messageservice' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 828c1af93..2f59b7a54 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -6,6 +6,11 @@ - '{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: 'dmaap/messagerouter/messageservice' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 91cde72e6..82077fab2 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -6,6 +6,11 @@ - '{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: 'dmaap/messagerouter/mirroragent' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index ba2642841..69ab4d375 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -6,6 +6,11 @@ - '{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: 'dmaap/messagerouter/msgrtr' stream: - 'master': diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml index de9855ca3..77416d1dc 100644 --- a/jjb/dmaap/dmaap-zookeeper.yaml +++ b/jjb/dmaap/dmaap-zookeeper.yaml @@ -18,6 +18,12 @@ mvn-params: '-Dmaven.test.skip=true' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: '-Dmaven.test.skip=true' + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/zookeeper' stream: - 'master': diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index e06166ad0..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,6 +25,8 @@ branch: 'beijing' - casablanca: branch: 'casablanca' + - dublin: + branch: 'dublin' - project: name: doc-info diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index d3021cc8f..574e17ee8 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -11,18 +11,21 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-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 -P docker' project: 'externalapi/nbi' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' files: '**' archive-artifacts: '' @@ -55,8 +58,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' - project: @@ -67,7 +68,7 @@ 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' 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-templates-c.yaml b/jjb/global-templates-c.yaml index 9f9bdf9f1..38a06ce34 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -1,40 +1,67 @@ --- -# 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-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 +74,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 +81,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 @@ -101,6 +102,34 @@ - docker-login - shell: '{script}' +- job-template: + # + # job template for build project executed every 6hrs + # + # Required Variables: + # script: build script to execute + name: '{name}-{stream}-shell-6hrs' + node: '{build-node}' + type: freestyle + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: '{project}' + stream: '{stream}' + lftools-version: '{lftools-version}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: 'gerrit' + + triggers: + - timed: '00 */6 * * *' + + builders: + - shell: '{script}' + publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish 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 f5c6bcde4..12ce9a383 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -17,6 +17,7 @@ git-url: '$GIT_URL/$PROJECT' post_build_script: '' pre_build_script: '' + submodule-disable: false submodule-recursive: true submodule-timeout: 10 @@ -129,6 +130,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -168,6 +170,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -272,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/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 517643eb1..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: diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 06315de24..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 diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 089a55f1f..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 diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 6ed067e08..401eecf0b 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -5,39 +5,6 @@ views: - project-view -- project: - name: integration - project-name: 'integration' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - project: 'integration' - subproject: - - 'version-manifest': - pom: 'version-manifest/pom.xml' - pattern: 'version-manifest/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'integration-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: integration-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f version-manifest/pom.xml' - nexus-iq-namespace: 'onap-' - project: integration - project-name: 'integration' - stream: - - 'master': - branch: 'master' - mvn-settings: 'integration-settings' - - project: name: integration-info project-name: integration 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 bf27f50b1..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' 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 15b1a4273..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' 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 71fbb33bd..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' 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 3feabec6e..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' diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 0e5919f0f..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' @@ -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/modeling-toscaparsers-genericparser.yaml b/jjb/modeling/modeling-toscaparsers-genericparser.yaml index f21e60cd7..88ab33255 100644 --- a/jjb/modeling/modeling-toscaparsers-genericparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-genericparser.yaml @@ -16,7 +16,10 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{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-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 1e65aa8b9..4ff6b3d25 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -17,7 +17,12 @@ - '{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 + mvn-pom: 'nfvparser/pom.xml' + mvn-params: '-f nfvparser/pom.xml' - project: name: modeling-toscaparsers-nfvparser-sonar diff --git a/jjb/multicloud/kud-deployment.sh b/jjb/multicloud/kud-deployment.sh new file mode 100644 index 000000000..a5cc39e47 --- /dev/null +++ b/jjb/multicloud/kud-deployment.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +set -x -e -o pipefail +cd ./kud/ci +bash -x ./kud-installer.sh diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index 10c8d3edf..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' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 14ebfc30a..c2b72cf84 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -15,6 +15,10 @@ 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' diff --git a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml b/jjb/multicloud/multicloud-k8s-kud-deployment.yaml new file mode 100644 index 000000000..d5334647d --- /dev/null +++ b/jjb/multicloud/multicloud-k8s-kud-deployment.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: multicloud-k8s-kud-deployment + project: 'multicloud/k8s' + build-node: ubuntu1604-builder-4c-4g + kud_build_script: !include-raw-escape: kud-deployment.sh + + stream: + - 'master': + branch: 'master' + + jobs: + - '{name}-{stream}-shell-6hrs': + script: '{kud_build_script}' + diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 8a1ec577a..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' diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml index 972535e22..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' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index c9151f793..9947419b9 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -62,6 +62,10 @@ - '{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' diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml index cd0e24624..273efcf15 100644 --- a/jjb/music/music-mdbc.yaml +++ b/jjb/music/music-mdbc.yaml @@ -9,7 +9,6 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - '{project-name}-{stream}-release-version-java-daily' project: 'music/mdbc' stream: - 'master': diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml index ba300573a..0349f9b4e 100644 --- a/jjb/music/music-prom.yaml +++ b/jjb/music/music-prom.yaml @@ -9,12 +9,12 @@ 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' - mvn-profile: docker - mvn-params: '-Dmaven.test.skip=true' - build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-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 -P docker' project: 'music/prom' stream: - 'master': diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 1f05ce892..a69bb7eb3 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -15,12 +15,12 @@ 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' - mvn-profile: docker - mvn-params: '-Dmaven.test.skip=true' - build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-docker-stage: + 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 -P docker' project: 'music' stream: - '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/include-yaml-check.sh b/jjb/oom/include-yaml-check.sh deleted file mode 100755 index 27359e597..000000000 --- a/jjb/oom/include-yaml-check.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# setting-up bash flags -set -x -e -o pipefail - -# remove old ansible - current centos build minion -# is quite old and using incompatible ansible 2.4.x -sudo yum -y remove ansible -sudo pip install ansible ansible-lint - -# perform check -ansible --version -ansible-lint --version -ansible-lint ./ansible/site.yml -vvv 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 index ca2f15fc9..7e462d283 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -2,13 +2,13 @@ - project: name: offline-installer project-name: 'offline-installer' - build-node: centos7-builder-2c-1g - offline_build_script: !include-raw-escape: include-yaml-check.sh + 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}-yaml-lint': - build_script: '{offline_build_script}' + - '{project-name}-{stream}-review': + build_script: '{offline_review_bootstrap}' diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 43ae80783..13886207c 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -12,10 +12,22 @@ #!/bin/bash set -e -o pipefail cd kubernetes/ + if [ "$GERRIT_BRANCH" != "staging" ]; then + if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then + echo "[ERROR] Only release images are allowed in helm charts." + exit 1 + fi + fi make all subproject_build_script: | #!/bin/bash cd kubernetes/ + if [ "$GERRIT_BRANCH" != "staging" ]; then + if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then + echo "[ERROR] Only release images are allowed in helm charts." + exit 1 + fi + fi make common make {subproject} oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml index 02eae3fe3..5f95f70b8 100644 --- a/jjb/oom/oom-jobs.yaml +++ b/jjb/oom/oom-jobs.yaml @@ -1,8 +1,8 @@ --- - job-template: - name: '{project-name}-{stream}-yaml-lint' + name: '{project-name}-{stream}-review' node: '{build-node}' - type: freestyle + project-type: freestyle build_script: '' pattern: '**' diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 08380da9d..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' diff --git a/jjb/optf/build-optf-fgps-docker-image.sh b/jjb/optf/build-optf-fgps-docker-image.sh new file mode 100644 index 000000000..6c93c8b9d --- /dev/null +++ b/jjb/optf/build-optf-fgps-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./*.* + +./build-dockers.sh diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 5de8faead..5b240f439 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -10,8 +10,6 @@ project-name: 'optf-cmso' jobs: - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-verify-java-checkstyle': mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' @@ -19,10 +17,6 @@ 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' diff --git a/jjb/optf/optf-fgps-csit.yaml b/jjb/optf/optf-fgps-csit.yaml new file mode 100644 index 000000000..a60c453ef --- /dev/null +++ b/jjb/optf/optf-fgps-csit.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: optf-fgps-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'optf-fgps' + stream: + - 'master': + branch: master + functionality: + - 'fgps': + trigger_jobs: 'optf-fgps-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml new file mode 100644 index 000000000..110d1ecc7 --- /dev/null +++ b/jjb/optf/optf-fgps.yaml @@ -0,0 +1,92 @@ +--- +- project: + name: optf-fgps + project-name: 'optf-fgps' + project: 'optf/fgps' + stream: + - 'master': + branch: 'master' + mvn-settings: 'optf-fgps-settings' + subproject: + - 'valetapi': + path: 'valetapi' + pattern: 'valetapi/**' + pom: 'pom.xml' + - 'engine': + path: 'engine' + pattern: 'engine/**' + pom: 'pom.xml' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - 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' + +- project: + name: optf-fgps-docker + project-name: 'optf-fgps' + project: 'optf/fgps' + stream: + - 'master': + branch: 'master' + mvn-settings: 'optf-fgps-settings' + subproject: + - 'valetapi': + path: 'valetapi' + pattern: 'valetapi/**' + pom: 'pom.xml' + jobs: + - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + mvn-params: '-Dmaven.test.skip=true' + script: + !include-raw-escape: 'build-optf-fgps-docker-image.sh' + build-node: queue-docker-4c-4g + - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + mvn-params: '-Dmaven.test.skip=true' + script: + !include-raw-escape: 'build-optf-fgps-docker-image.sh' + build-node: queue-docker-4c-4g + +- project: + name: optf-fgps-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'optf/fgps' + project-name: 'optf-fgps' + branch: 'master' + mvn-settings: 'optf-fgps-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: optf-fgps-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: optf/fgps + project-name: 'optf-fgps' + stream: + - 'master': + branch: 'master' + mvn-settings: 'optf-fgps-settings' + +- project: + name: optf-fgps-info + project-name: optf-fgps + jobs: + - gerrit-info-yaml-verify + project: optf/fgps + branch: master diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 3329bcde1..50a8035f8 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -19,9 +19,8 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g maven-versions-plugin: true - - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 141f2bc24..094985082 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -18,9 +18,8 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g maven-versions-plugin: true - - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index f23b9c1e8..10ef69da2 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -10,19 +10,26 @@ project-name: 'policy-apex-pdp' jobs: - '{project-name}-{stream}-verify-java' - - '{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: 'include-raw-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: 'include-raw-docker-release.sh' - disabled: false + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: "-P docker" + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker' + disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'policy/apex-pdp' stream: - 'master': @@ -30,11 +37,11 @@ mvn-settings: 'policy-apex-pdp-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1604-docker-8c-8g - project: - name: policy-apex-pdp-casablanca - project-name: 'policy-apex-pdp-casablanca' + name: policy-apex-pdp-dublin + project-name: 'policy-apex-pdp-dublin' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': @@ -48,12 +55,12 @@ -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: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'policy-apex-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 946290919..8038cb3e0 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -12,8 +12,18 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: false + disabled: true + build-node: ubuntu1604-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'policy/api' stream: @@ -24,6 +34,28 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: policy-api-dublin + project-name: 'policy-api-dublin' + jobs: + - '{project-name}-{stream}-verify-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: + - 'dublin': + branch: 'dublin' + mvn-settings: 'policy-api-settings' + - project: name: policy-api-sonar jobs: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index ccf6c75dd..2e99c97e7 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -5,8 +5,12 @@ 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': - disabled: false + disabled: true project: 'policy/common' stream: @@ -18,18 +22,18 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-common-casablanca - project-name: 'policy-common-casablanca' + name: policy-common-dublin + project-name: 'policy-common-dublin' jobs: - '{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: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'policy-common-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index cedbc64a8..fe89f30f3 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'health' trigger_jobs: @@ -15,7 +17,6 @@ - 'policy-drools-applications-{stream}-merge-java' robot-options: '' build-timeout: 40 - branch: 'master' - project: name: policy-apex-pdp-csit @@ -26,12 +27,13 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'apex-pdp' trigger_jobs: - 'policy-apex-pdp-{stream}-merge-scm-mvn-script' robot-options: '' - branch: 'master' - project: name: policy-distribution-csit @@ -42,12 +44,13 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'distribution' trigger_jobs: - 'policy-distribution-{stream}-merge-java' robot-options: '' - branch: 'master' - project: name: policy-api-csit @@ -58,12 +61,13 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'api' trigger_jobs: - 'policy-api-{stream}-merge-java' robot-options: '' - branch: 'master' - project: name: policy-xacml-pdp-csit @@ -74,12 +78,13 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'xacml-pdp' trigger_jobs: - 'policy-xacml-pdp-{stream}-merge-java' robot-options: '' - branch: 'master' - project: name: policy-pap-csit @@ -90,12 +95,13 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'pap' trigger_jobs: - 'policy-pap-{stream}-merge-java' robot-options: '' - branch: 'master' - project: name: policy-drools-pdp-csit @@ -106,12 +112,13 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'drools-pdp' trigger_jobs: - 'policy-drools-pdp-{stream}-merge-java' robot-options: '' - branch: 'master' - project: name: policy-drools-applications-csit @@ -122,10 +129,11 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin 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 6c5753c69..e8a16819b 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: false + disabled: true build-node: ubuntu1604-docker-8c-8g project: 'policy/distribution' @@ -25,8 +25,8 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-distribution-casablanca - project-name: 'policy-distribution-casablanca' + name: policy-distribution-dublin + project-name: 'policy-distribution-dublin' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java': @@ -37,13 +37,13 @@ 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' stream: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'policy-distribution-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index c378217a0..0e77931df 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -2,6 +2,31 @@ - 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 + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-docker-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: policy-docker-base-common-dublin + project-name: 'policy-docker-dublin' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java': @@ -17,8 +42,8 @@ build-node: ubuntu1604-docker-8c-8g project: 'policy/docker' stream: - - 'master': - branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index bab2c2e52..bc5d33dd2 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -4,19 +4,26 @@ project-name: 'policy-drools-applications' jobs: - '{project-name}-{stream}-verify-java' - - '{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': + - '{project-name}-{stream}-merge-java': 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 + mvn-profile: 'docker' + mvn-params: "-P docker" + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker' + disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'policy/drools-applications' stream: @@ -25,21 +32,31 @@ mvn-settings: 'policy-drools-applications-settings' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: ubuntu1604-docker-8c-8g - project: - name: policy-drools-applications-casablanca - project-name: 'policy-drools-applications-casablanca' + name: policy-drools-applications-dublin + project-name: 'policy-drools-applications-dublin' 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: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'policy-drools-applications-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index c7ab5c2b3..b0ded4a35 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -4,19 +4,26 @@ project-name: 'policy-drools-pdp' jobs: - '{project-name}-{stream}-verify-java' - - '{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: 'include-raw-docker-merge.sh' - - '{project-name}-{stream}-docker-java-version-shell-daily': + - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + mvn-profile: 'docker' + mvn-params: "-P docker" + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker' + disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'policy/drools-pdp' stream: - 'master': @@ -24,11 +31,11 @@ mvn-settings: 'policy-drools-pdp-settings' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: ubuntu1604-docker-8c-8g - project: - name: policy-drools-pdp-casablanca - project-name: 'policy-drools-pdp-casablanca' + name: policy-drools-pdp-dublin + project-name: 'policy-drools-pdp-dublin' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': @@ -42,12 +49,12 @@ -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: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'policy-drools-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 114adb78e..ab7b8aadd 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -4,19 +4,26 @@ project-name: 'policy-engine' jobs: - '{project-name}-{stream}-verify-java' - - '{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: 'include-raw-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: 'include-raw-docker-release.sh' - disabled: false + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: "-P docker" + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker' + disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'policy/engine' stream: - 'master': @@ -24,11 +31,11 @@ mvn-settings: 'policy-engine-settings' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1604-docker-8c-8g' - project: - name: policy-engine-casablanca - project-name: 'policy-engine-casablanca' + name: policy-engine-dublin + project-name: 'policy-engine-dublin' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': @@ -42,12 +49,12 @@ -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: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'policy-engine-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index b7507abb7..b9f6c78cd 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -6,7 +6,11 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'policy/models' stream: @@ -17,6 +21,24 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: policy-models-dublin + project-name: 'policy-models-dublin' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily': + disabled: false + + project: 'policy/models' + stream: + - 'dublin': + branch: 'dublin' + mvn-settings: 'policy-models-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: policy-models-sonar jobs: diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index e33bb2380..8a6666b45 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -12,8 +12,18 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: false + disabled: true + build-node: ubuntu1604-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'policy/pap' stream: @@ -24,6 +34,31 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: policy-pap-dublin + project-name: 'policy-pap-dublin' + jobs: + - '{project-name}-{stream}-verify-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: + - 'dublin': + branch: 'dublin' + mvn-settings: 'policy-pap-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: policy-pap-sonar jobs: diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 22c1edf17..7722b81b2 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -5,8 +5,12 @@ 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': - disabled: false + disabled: true project: 'policy/parent' stream: @@ -18,18 +22,18 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-parent-casablanca - project-name: 'policy-parent-casablanca' + name: policy-parent-dublin + project-name: 'policy-parent-dublin' jobs: - '{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: - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'policy-parent-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 1ad7b7a1b..e50db0764 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -12,8 +12,18 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: false + disabled: true + build-node: ubuntu1604-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'policy/xacml-pdp' stream: @@ -24,6 +34,31 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: policy-xacml-pdp-dublin + project-name: 'policy-xacml-pdp-dublin' + jobs: + - '{project-name}-{stream}-verify-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: + - 'dublin': + branch: 'dublin' + mvn-settings: 'policy-xacml-pdp-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: policy-xacml-pdp-sonar jobs: diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 1af647470..7ec4294d7 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' functionality: - 'sanity': trigger_jobs: '{project-name}-{stream}-sdc-merge-java' diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index 52547b224..18146a2f2 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -21,6 +21,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-ci-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-csit.yaml b/jjb/sdc/sdc-dcae-d-csit.yaml new file mode 100644 index 000000000..e828e27e6 --- /dev/null +++ b/jjb/sdc/sdc-dcae-d-csit.yaml @@ -0,0 +1,19 @@ +--- +- project: + name: sdc-dcae-d-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'sdc-dcae-d' + stream: + - 'master': + branch: 'master' + functionality: + - 'dcaed': + trigger_jobs: + - 'sdc-{stream}-docker-version-java-daily' + - '{project-name}-dt-be-main-{stream}-docker-version-java-daily' + - '{project-name}-dt-{stream}-docker-version-java-daily' + - '{project-name}-fe-{stream}-docker-version-java-daily' + - '{project-name}-tosca-lab-{stream}-docker-java-daily' + robot-options: '' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 70efc8408..1b896e0bb 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index 08044a1fb..e203c5cf7 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -10,6 +10,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index ee6eec04d..03f0e889c 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 4f459d5f1..8191aaee0 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-dcae-d-fe-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 397b82957..f6332ff6e 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' subproject: - dcae-d-tosca-lab: path: '.' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index bda26b76a..a36b758be 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml new file mode 100644 index 000000000..5e48a6064 --- /dev/null +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -0,0 +1,55 @@ +--- +- project: + name: sdc-sdc-be-common-project-view + project-name: sdc-sdc-be-common + views: + - project-view + +- project: + name: sdc-sdc-be-common + project-name: 'sdc-sdc-be-common' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-merge-java' + project: 'sdc/sdc-be-common' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-sdc-be-common-settings' + files: '**' + archive-artifacts: '' + build-timeout: 60 + maven-version: 'mvn35' + +- project: + name: sdc-sdc-be-common-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'sdc/sdc-be-common' + project-name: 'sdc-sdc-be-common' + branch: 'master' + mvn-settings: 'sdc-sdc-be-common-settings' + mvn-params: '-Dsonar.branch={branch}' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m' + +- project: + name: sdc-sdc-be-common-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: sdc/sdc-be-common + project-name: 'sdc-sdc-be-common' + branch: 'master' + mvn-settings: 'sdc-sdc-be-common-settings' + +- project: + name: sdc-sdc-be-common-info + project-name: sdc-sdc-be-common + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-be-common + branch: master diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 273fda71a..03b9d2abc 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index f94773a87..2930983fc 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -17,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-sdc-pubsub-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index f1ef58c98..73662b962 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index b20422991..7db82e592 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -19,6 +19,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index a6e2dd58b..a164c5411 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -45,6 +45,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 3cba3d94c..cf747e7f2 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -11,15 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/apps' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'sdnc-apps-settings' @@ -58,8 +58,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'sdnc-apps-settings' @@ -95,8 +93,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'sdnc-apps-settings' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 32ed192f7..7e0f5def3 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -5,15 +5,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/northbound' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'sdnc-northbound-settings' @@ -51,8 +51,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'sdnc-northbound-settings' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index f6eb04cd7..2b2999402 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -6,14 +6,14 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/oam' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'sdnc-oam-settings' @@ -33,8 +33,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'sdnc-oam-settings' @@ -70,8 +68,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - 'dublin': branch: 'dublin' mvn-settings: 'sdnc-oam-settings' 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 95% rename from jjb/testsuite/testsuite-heatbridge-master.yaml rename to jjb/testsuite/testsuite-heatbridge.yaml index fd6ec4ccc..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: '' diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index 541359793..5cd681510 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -11,15 +11,34 @@ - '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-verify + project-name: 'testsuite-python-testing-utils' + project: 'testsuite/python-testing-utils' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'testsuite-python-testing-utils-settings' + build-node: 'ubuntu1604-builder-4c-4g' + subproject: + - 'robotframework-onap': + path: 'robotframework-onap' + pattern: 'robotframework-onap/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - project: name: testsuite-python-testing-utils-master-clm jobs: diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index d41cc6d51..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' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 92e4eb78e..b7055947e 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.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-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index d0e8809f5..1e034bf4b 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -16,7 +16,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 diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index 63ed4095d..cb8b137d6 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -12,8 +12,3 @@ chmod 755 ./zte/vmanager/docker/*.* echo '============== BUILDING HUAWEI IMAGE =================' chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh - -echo '============== BUILDING NOKIA V1 IMAGE =================' -chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* -./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh - diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 2442077ef..0bf14a533 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -20,7 +20,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-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-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 1264efda5..7a9a5d2a6 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -14,7 +14,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-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-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index e9fa8fe5c..41fe31750 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -15,7 +15,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-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-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 81b452742..27762f943 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -16,7 +16,10 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{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-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 86f9e5cb2..30200de1c 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.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-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index e2955519b..9ca917846 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -15,7 +15,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-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-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 10ea310aa..aa4e8c694 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -14,7 +14,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: 'zte/sfc-driver/pom.xml' + mvn-params: '-f zte/sfc-driver/pom.xml' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 46a0e3c1f..6bb4318b1 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -14,7 +14,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: 'huawei/pom.xml' + mvn-params: '-f huawei/pom.xml' files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index ac8c87e0f..17fa14f15 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -15,7 +15,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: 'gvnfmadapter/pom.xml' + mvn-params: '-f gvnfmadapter/pom.xml' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml index 788b8fb54..2fea7c7ea 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml @@ -15,7 +15,6 @@ 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 diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index abcf1ed2d..3ba98f605 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -14,7 +14,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: 'nokiav2/pom.xml' + mvn-params: '-f nokiav2/pom.xml' files: 'nokiav2/**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml index 1dd3cff8d..2ce9b1c86 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml @@ -15,7 +15,11 @@ - '{project-name}-{stream}-merge-profile-java': build-node: ubuntu1604-docker-8c-8g pattern: 'pom.xml' - - '{project-name}-{stream}-release-version-profile-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-params: '-P rootOnly' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index 366366360..2bb739ecd 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -14,7 +14,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: 'zte/vmanager/pom.xml' + mvn-params: '-f zte/vmanager/pom.xml' files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index 2805ea95f..ecfa23aa9 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -10,7 +10,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-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml index 935ffcaad..c5de861fc 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy.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-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 7ebfd06cf..b377c03f3 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.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-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 9664d08e9..1f89eae90 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -21,13 +21,64 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': mvn-goals: 'clean' files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: vfc-nfvo-wfengine-engine-mgr-service-stage + project-name: 'vfc-nfvo-wfengine-engine-mgr-service' + project: 'vfc/nfvo/wfengine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' + subproject: + - 'engine-mgr-service': + pom: 'wfenginemgrservice/pom.xml' + pattern: 'wfenginemgrservice/**' + script: + !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'wfenginemgrservice/pom.xml' + mvn-params: '-f wfenginemgrservice/pom.xml' + + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: vfc-nfvo-wfengine-engine-activiti-extension-stage + project-name: 'vfc-nfvo-wfengine-engine-activiti-extension' + project: 'vfc/nfvo/wfengine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' + subproject: + - 'engine-activiti-extension': + pom: 'activiti-extension/pom.xml' + pattern: 'activiti-extension/**' + script: + !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'activiti-extension/pom.xml' + mvn-params: '-f activiti-extension/pom.xml' + + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: vfc-nfvo-wfengine-wfenginemgrservice-sonar jobs: diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index c4643e565..b8d0b0aa4 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'healthCheck': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index d3ffe6837..3a75eca5e 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -11,33 +11,27 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: queue-docker-4c-4g + maven-versions-plugin: true + mvn-params: '-P docker' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'vid' stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: vid-docker - project-name: 'vid' - 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: queue-docker-4c-4g - #- project: # name: vid-docker-arm64 # project-name: 'vid-arm64' diff --git a/jjb/vnfrqts/pre-build-needs.sh b/jjb/vnfrqts/pre-build-needs.sh index c5fb7b64e..da1d5e2d1 100644 --- a/jjb/vnfrqts/pre-build-needs.sh +++ b/jjb/vnfrqts/pre-build-needs.sh @@ -5,5 +5,4 @@ source $WORKSPACE/venv-tox/bin/activate pip install --upgrade pip pip install -r etc/requirements.txt ls -wget -O $WORKSPACE/docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" tox -e needs \ No newline at end of file diff --git a/packer/common-packer b/packer/common-packer index ec0181407..1cb0f11ad 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit ec01814071eaea55ea7b025308b58d3923897eb6 +Subproject commit 1cb0f11add7a8494b6b22f4d55a5ab3f7b1ee3cd diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 37ca313aa..d38ff8f6d 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -58,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 @@ -69,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: @@ -85,6 +88,7 @@ - libmysqlclient-dev - gcc become: true + when: ansible_distribution == 'Ubuntu' - name: Install base packages apt: @@ -100,6 +104,7 @@ - libssl-dev - libffi-dev become: true + when: ansible_distribution == 'Ubuntu' - name: Install autorelease support packages apt: @@ -110,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: @@ -141,26 +148,25 @@ - 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 + deb: https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb 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: @@ -169,13 +175,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: @@ -184,7 +190,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: @@ -192,13 +198,20 @@ 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' + + - name: Install jinja2 + pip: + name: jinja2 + state: present + become: true + when: ansible_architecture == 'x86_64' diff --git a/packer/vars/centos-7.json b/packer/vars/centos-7.json deleted file mode 100644 index 3bae793fc..000000000 --- a/packer/vars/centos-7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "base_image": "ZZCI - CentOS 7 - builder - 20180328-1726", - "ssh_user": "centos", - "distro": "CentOS 7", - "cloud_user_data": "provision/rh-user_data.sh" -} diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh new file mode 100644 index 000000000..22a42c2d5 --- /dev/null +++ b/shell/maven-coverity.sh @@ -0,0 +1,166 @@ +#!/bin/bash + +# Copyright 2019 Samsung Electronics Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -Eeuxo pipefail +PS4='+['$(readlink -f "$0")' ${FUNCNAME[0]%main}#$LINENO] ' + +echo '---> maven-coverity.sh' + +#----------------------------------------------------------------------------- +# Process parameters for JS/PHP/Ruby files analysis + +FS_CAPTURE_SEARCH_PARAMS='' +if [ -n "${SEARCH_PATHS:=}" ]; then + for SEARCH_PATH in ${SEARCH_PATHS}; do + if [ -d "${SEARCH_PATH}" ]; then + FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS} --fs-capture-search '${SEARCH_PATH}'" + else + echo "'${SEARCH_PATH}' from \$SEARCH_PATHS is not an existing directory." >&2 + exit 1 + fi + done +fi + +for EXCLUDE_REGEX in ${SEARCH_EXCLUDE_REGEXS:=}; do + FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS} --fs-capture-search-exclude-regex '${EXCLUDE_REGEX}'" +done + +#----------------------------------------------------------------------------- +# Check if we are allowed to submit results to Coverity Scan service +# and have not exceeded our upload quota limits +# See also: https://scan.coverity.com/faq#frequency + +CURL_OUTPUT=$( + curl \ + --verbose \ + --silent \ + --show-error \ + --fail \ + --form "project=${COVERITY_PROJECT_NAME}" \ + --form "token=${COVERITY_TOKEN}" \ + 'https://scan.coverity.com/api/upload_permitted' +) + +IS_COVERITY_UPLOAD_PERMITTED=$( + echo "${CURL_OUTPUT}" \ + | jq '.upload_permitted' +) +if [ x"${IS_COVERITY_UPLOAD_PERMITTED}" != x'true' ]; then + echo "Upload quota reached. Next upload permitted at "$(echo "${CURL_OUTPUT}" | jq '.next_upload_permitted_at') >&2 + exit 1 +fi + +#----------------------------------------------------------------------------- +# Get Coverity Scan build tool + +curl \ + --verbose \ + --silent \ + --show-error \ + --fail \ + --form "project=${COVERITY_PROJECT_NAME}" \ + --form "token=${COVERITY_TOKEN}" \ + --output 'coverity_tool.tgz' \ + 'https://scan.coverity.com/download/linux64' + +curl \ + --verbose \ + --silent \ + --show-error \ + --fail \ + --form "project=${COVERITY_PROJECT_NAME}" \ + --form "token=${COVERITY_TOKEN}" \ + --form 'md5=1' \ + --output 'coverity_tool.md5' \ + 'https://scan.coverity.com/download/linux64' + +echo -n ' coverity_tool.tgz' >> 'coverity_tool.md5' +md5sum --check 'coverity_tool.md5' + +tar \ + --extract \ + --gunzip \ + --file='coverity_tool.tgz' + +COVERITY_BUILD_TOOL_DIRECTORY=$( + head -1 <( \ + tar \ + --list \ + --gunzip \ + --file='coverity_tool.tgz' + ) +) +COVERITY_BINARY_DIRECTORY="${COVERITY_BUILD_TOOL_DIRECTORY}bin" +test -d "${COVERITY_BINARY_DIRECTORY}" \ + || exit 1 +export PATH="${PATH}:${COVERITY_BINARY_DIRECTORY}" + +rm 'coverity_tool.tgz' + +#----------------------------------------------------------------------------- +# Build + +export MAVEN_OPTS + +eval cov-build \ + --dir 'cov-int' \ + ${FS_CAPTURE_SEARCH_PARAMS} \ + "${MVN}" clean install \ + --errors \ + --global-settings "${GLOBAL_SETTINGS_FILE}" \ + --settings "${SETTINGS_FILE}" \ + ${MAVEN_OPTIONS:=} \ + ${MAVEN_PARAMS:=} + +cov-import-scm \ + --dir 'cov-int' \ + --scm 'git' + +cov-manage-emit \ + --dir cov-int \ + list \ +| grep \ + --invert-match \ + '^Translation unit:$' \ +| sed \ + 's!^[[:digit:]]\+ -> !!' \ +> 'coverity-scan-analysed-files.log' + +#----------------------------------------------------------------------------- +# Submit results to Coverity service + +tar \ + --create \ + --gzip \ + --file='results.tgz' \ + 'cov-int' + +curl \ + --verbose \ + --silent \ + --show-error \ + --fail \ + --form "project=${COVERITY_PROJECT_NAME}" \ + --form "email=${COVERITY_USER_EMAIL}" \ + --form "token=${COVERITY_TOKEN}" \ + --form 'file=@results.tgz' \ + --form "version=${GIT_COMMIT:0:7}" \ + --form "description=${GIT_BRANCH}" \ + 'https://scan.coverity.com/builds' + +#----------------------------------------------------------------------------- + +exit 0