diff options
189 files changed, 1153 insertions, 404 deletions
diff --git a/global-jjb b/global-jjb -Subproject 36bdbac77603d827912429a2db0794176564089 +Subproject 200c13dbad2552db1ba9cfc185b0dc40db86393 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 1bd5189d2..a54241965 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 - x86_64 - 20190610-221458.344 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553 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 1fea53c10..c583dd880 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 - x86_64 - 20190610-221458.344 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553 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 index 33e096f48..1829cfe50 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190610-221311.883 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190926-164302.295 LABELS=centos7-docker-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg index 628928617..d757901bb 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=CentOS 7 - memcached - - 70880808-8008 +IMAGE_NAME=CentOS 7 - memcached - - 260980909-9003 LABELS=centos7-memcached-4c-4g HARDWARE_ID=v2-highcpu-4 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 b8b74a824..88b7dc1f0 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 - - 100680606-6010 +IMAGE_NAME=CentOS 7 - redis - - 260980909-9003 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 b3c72a265..75014db77 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 - 20190510-225520.575 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261 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 29b2cd044..111d8a7e4 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=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191007-191710.199 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 8780f9537..cb9b2776a 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=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191007-191710.199 LABELS=ubuntu1604-builder-4c-2g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg index 48112d50f..118044308 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191007-191710.199 LABELS=ubuntu1604-builder-4c-4g 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 a01f33692..2d4bd3781 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=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191007-191710.199 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 637bf61d9..225e5c47c 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 - 20190510-225520.575 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261 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 c1d860e2b..a326f3843 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 - 20190510-225520.575 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261 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 81f53c8c8..8f57b1d3c 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 - - 20190607-124834.118 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - - 20190925-211723.485 LABELS=ubuntu1604-helm-2c-1g HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index 4fb913d8d..7b124aaab 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -1,3 +1,5 @@ +CONTAINER_PULL_REGISTRY=nexus3.onap.org:10003 +CONTAINER_PUSH_REGISTRY=nexus3.onap.org:10002 DOCKER_REGISTRY=nexus3.onap.org DOCKERHUB_REGISTRY=docker.io GERRIT_URL=https://gerrit.onap.org/r diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index 0e5d1c5fd..146fe6e64 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -1,3 +1,5 @@ +CONTAINER_PULL_REGISTRY=nexus3.onap.org:10003 +CONTAINER_PUSH_REGISTRY=nexus3.onap.org:10002 DOCKER_REGISTRY=nexus3.onap.org DOCKERHUB_REGISTRY=docker.io GERRIT_URL=https://gerrit.onap.org/r diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index efad52617..5531462a6 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -16,7 +16,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker' build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/aaf/aaf-csit.yaml b/jjb/aaf/aaf-csit.yaml index 42aefcf38..1b25747ea 100644 --- a/jjb/aaf/aaf-csit.yaml +++ b/jjb/aaf/aaf-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'aaf' stream: 'master' + disabled: true functionality: - 'aafapi': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/aaf/aaf-sms-csit.yaml b/jjb/aaf/aaf-sms-csit.yaml index 4e7f3ab08..5b08c55a4 100644 --- a/jjb/aaf/aaf-sms-csit.yaml +++ b/jjb/aaf/aaf-sms-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'aaf' stream: 'master' + disabled: true functionality: - 'sms-test-plan': trigger_jobs: 'aaf-sms-master-docker-golang-shell-daily' diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 210ac11d1..51fec3710 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -15,7 +15,7 @@ build-node: ubuntu1604-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/aai-common' stream: - 'master': @@ -77,12 +77,9 @@ project-name: 'aai-aai-common' project: 'aai/aai-common' stream: - - 'master-alpine': + - 'master': branch: 'master' distro: 'alpine' - - 'master-ubuntu': - branch: 'master' - distro: 'ubuntu' docker_name: 'onap/aai-common-{distro}' docker_build_args: '-f ./Dockerfile.{distro}' docker_root: '$WORKSPACE/Dockerfiles/aai-common/' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index cab62d047..10a433be4 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -16,12 +16,12 @@ 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' + mvn-params: '-P docker -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-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/babel' stream: - 'elalto': diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index fa5f487eb..eaf3e8ff2 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -15,7 +15,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/cacher' stream: - 'master': diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index 031e3f0b2..c20c2f903 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/chameleon' stream: - 'elalto': diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index ac7a91118..b6a029f41 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/champ' stream: - 'master': diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml index 4e9c16c44..0b3abdfff 100644 --- a/jjb/aai/aai-csit.yaml +++ b/jjb/aai/aai-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'aai' + disabled: true stream: - 'master': branch: master @@ -16,4 +17,3 @@ - 'esr-server': trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily' robot-options: '' - diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 357727522..1270de422 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -16,12 +16,12 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-P docker -B -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-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/data-router' stream: - 'elalto': diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 2c0df6f8a..c32692dc8 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/esr-gui' stream: - 'master': diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 695d3cc3f..2c9d99674 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/esr-server' stream: - 'master': diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 4c373c011..662966de8 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/event-client' stream: - 'elalto': diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index 2a3593dce..7799d91d8 100644 --- a/jjb/aai/aai-gallifrey.yaml +++ b/jjb/aai/aai-gallifrey.yaml @@ -15,7 +15,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/gallifrey' stream: - 'elalto': diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index 9c18eb9c6..b22b9058e 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -16,12 +16,12 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-P docker -B -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-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/gizmo' stream: - 'elalto': diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 5c08eea11..71ab03a5d 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/graphadmin' stream: - 'master': diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index fb6f87b99..ea34ec824 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -18,11 +18,13 @@ mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/graphgraph' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-graphgraph-settings' files: '**' archive-artifacts: '' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index a15128d35..bd17d2503 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/logging-service' stream: - 'elalto': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 152f01d15..626216949 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -16,12 +16,12 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-P docker -B -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-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/model-loader' stream: - 'elalto': diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index f8a061211..0e9bac8e0 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-oom-settings' files: '**' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 959d441dc..0477982d0 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/resources' stream: - 'master': diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index d2871b3c0..568218c7c 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/rest-client' stream: - 'elalto': diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index da8c56828..1b2b68f21 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/router-core' stream: - 'elalto': diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 77a9c6f29..9252e4d53 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/schema-service' stream: - 'master': diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 9a53e718c..945f6dcdc 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -16,12 +16,12 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-Pdocker -B -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-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/search-data-service' docker-image-name: 'onap/search-data-service' stream: @@ -38,7 +38,7 @@ project-name: 'aai-search-data-service-searchguard' jobs: - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-Pdocker -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 7e270003a..6835f73ad 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -16,12 +16,12 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: '-f sparkybe-onap-application/pom.xml docker:build -B -Dmaven.test.skip=true' + mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -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-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/sparky-be' stream: - 'elalto': diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index e17dcaf5e..c24f517ce 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1604-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/sparky-fe' stream: - 'elalto': diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index ec5228a38..48e920639 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -16,12 +16,12 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-P docker -B -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-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/spike' stream: - 'elalto': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 33934c680..4453c46fb 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/traversal' stream: - 'master': diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index 779f91616..1168c32d8 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'aai/validation' stream: - 'elalto': diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml index 9378e74a9..ffd1a8794 100644 --- a/jjb/appc/appc-cdt.yaml +++ b/jjb/appc/appc-cdt.yaml @@ -10,12 +10,14 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'appc/cdt' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'appc-cdt-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index dc38c0bf2..5edf91069 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -11,7 +11,10 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'appc-deployment-settings' + maven-version: "mvn35" files: '**' archive-artifacts: '' docker-pom: 'pom.xml' @@ -43,11 +46,16 @@ mvn-params: '-Dmaven.test.skip=true' - 'docker-version-java-daily': mvn-params: '-Dmaven.test.skip=true' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'appc/deployment' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'appc-deployment-settings' + maven-version: "mvn35" files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 30a4b94de..c833d790c 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -5,8 +5,12 @@ jobs: - '{project-name}-{stream}-verify-java': build-node: ubuntu1604-builder-8c-8g + mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" + java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - '{project-name}-{stream}-merge-java': build-node: ubuntu1604-builder-8c-8g + mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" + java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g @@ -14,13 +18,16 @@ - '{project-name}-{stream}-release-version-java-daily': build-node: ubuntu1604-builder-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'appc' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'appc-settings' + maven-version: "mvn35" files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g @@ -35,6 +42,7 @@ project-name: 'appc' branch: 'master' mvn-settings: 'appc-settings' + maven-version: "mvn35" mvn-goals: 'clean install' mvn-opts: '-Xmx4096m' @@ -45,11 +53,13 @@ mvn-params: '-DskipTests' build-timeout: 60 build-node: ubuntu1604-builder-8c-8g + mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" nexus-iq-namespace: 'onap-' project: 'appc' project-name: 'appc' branch: 'master' mvn-settings: 'appc-settings' + maven-version: "mvn35" - project: name: appc-info diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index fa63bb231..b8f6d889a 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -16,13 +16,16 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'appc/parent' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'appc-parent-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-2c-1g - project: diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 89eb16c27..c62fb3b7d 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -21,12 +21,14 @@ mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/apps' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'ccsdk-apps-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 8aab71f8e..885329c2c 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -17,12 +17,14 @@ maven-version: "mvn35" maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/cds' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'ccsdk-cds-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 7ec5a8970..cdb6f2a82 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -8,7 +8,7 @@ - gerrit-maven-stage: build-node: centos7-builder-4c-4g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/dashboard' stream: @@ -51,6 +51,14 @@ build-node: centos7-redis-4c-4g - project: + name: ccsdk-dashboard-info + project-name: ccsdk-dashboard + jobs: + - gerrit-info-yaml-verify + project: ccsdk/dashboard + branch: master + +- project: name: ccsdk-dashboard-whitesource project-name: ccsdk-dashboard jobs: diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 0857b3855..104ebc476 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -17,11 +17,15 @@ maven-version: "mvn35" maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/distribution' stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' + - 'elalto': + branch: 'elalto' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -73,8 +77,10 @@ - project: name: ccsdk-distribution-whitesource project-name: ccsdk-distribution + build-node: ubuntu1604-builder-8c-8g jobs: - - gerrit-whitesource-scan + - gerrit-whitesource-scan: + java-opts: '-Xmx2048m' mvn-settings: 'ccsdk-distribution-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 79e6d1430..fbbab16ee 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -9,12 +9,16 @@ build-node: centos7-builder-4c-4g sign-artifacts: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/features' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' + - 'elalto-fluorine': + branch: 'elalto-fluorine' mvn-settings: 'ccsdk-features-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -24,6 +28,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-node: ubuntu1604-builder-4c-4g - project: @@ -64,6 +69,7 @@ - project: name: ccsdk-features-whitesource + build-node: ubuntu1604-builder-8c-8g project-name: ccsdk-features jobs: - gerrit-whitesource-scan diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 807381e2e..cd04db752 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -3,20 +3,26 @@ name: ccsdk-parent project-name: 'ccsdk-parent' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': + - gerrit-maven-verify + - gerrit-maven-merge: cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true cron: '' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' project: 'ccsdk/parent' stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' + - 'elalto': + branch: 'elalto' mvn-settings: 'ccsdk-parent-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index e9b6ebd1e..ab6497673 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -9,7 +9,7 @@ build-node: centos7-builder-4c-4g sign-artifacts: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/platform/plugins' stream: diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 86513bbb3..bb05ee387 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -9,12 +9,16 @@ build-node: centos7-builder-4c-4g sign-artifacts: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/sli/adaptors' stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' + - 'elalto': + branch: 'elalto' mvn-settings: 'ccsdk-sli-adaptors-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -65,6 +69,7 @@ - project: name: ccsdk-sli-adaptors-whitesource + build-node: ubuntu1604-builder-8c-8g project-name: ccsdk-sli-adaptors jobs: - gerrit-whitesource-scan diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 6a3625061..a6415b6d1 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -9,12 +9,16 @@ build-node: centos7-builder-4c-4g sign-artifacts: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/sli/core' stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' + - 'elalto': + branch: 'elalto' mvn-settings: 'ccsdk-sli-core-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 7918ebe05..54de27aff 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -8,13 +8,17 @@ - gerrit-maven-stage: build-node: centos7-builder-4c-4g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g sign-artifacts: true project: 'ccsdk/sli/northbound' stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' + - 'elalto': + branch: 'elalto' mvn-settings: 'ccsdk-sli-northbound-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 6f3c39519..e08c8d0e7 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -9,12 +9,16 @@ build-node: centos7-builder-4c-4g sign-artifacts: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/sli/plugins' stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' + - 'elalto': + branch: 'elalto' mvn-settings: 'ccsdk-sli-plugins-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -24,6 +28,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" + build-node: ubuntu1604-builder-4c-4g - project: name: ccsdk-sli-plugins-sonar diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index ca72bea15..03350a881 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -9,7 +9,7 @@ build-node: centos7-builder-4c-4g sign-artifacts: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'ccsdk/utils' stream: diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml index fadea8882..6003bf24e 100644 --- a/jjb/ci-management/ci-management-coverity.yaml +++ b/jjb/ci-management/ci-management-coverity.yaml @@ -41,6 +41,7 @@ coverity-user-email: '' coverity-search-paths: '' coverity-search-exclude-regexs: '' + max-git-repo-age-hours: 0 stream: master submodule-recursive: true submodule-timeout: 10 @@ -101,6 +102,14 @@ name: DRY_RUN default: '{dry-run}' description: Do not submit results to Coverity Scan server at the end of the build. + - string: + name: 'MAX_GIT_REPO_AGE_HOURS' + default: '{max-git-repo-age-hours}' + description: > + If set to non-zero run the code scan only if there were no git + repository commits last MAX_GIT_REPO_AGE_HOURS hours. + It makes sense to set the value twice the 'cron' interval for the + job (e.g. if 'cron: @daily', then MAX_GIT_REPO_AGE_HOURS=48) triggers: - timed: '{obj:cron}' diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index 3c2579301..63b6e80f9 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - '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 fa169ef71..418f0f2b3 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -25,7 +25,7 @@ - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'clamp' stream: diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml index 48d1151ef..7438b8689 100644 --- a/jjb/cli/cli-csit.yaml +++ b/jjb/cli/cli-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'cli' + disabled: true stream: - 'master': branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index bbccbc2b9..2a4ef2953 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -19,7 +19,7 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean install' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g mvn-goals: 'clean deploy docker:build -DpushImage' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml index 230df5e87..1ba7b1599 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml @@ -21,7 +21,7 @@ mvn-params: '-DskipTests=true' - '{project-name}-{stream}-merge-java' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 35ac5eea4..ad771b773 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'el-alto': - branch: 'el-alto' + - 'elalto': + branch: 'elalto' # apply to all jobs project: 'dcaegen2/collectors/datafile' mvn-settings: 'dcaegen2-collectors-datafile-settings' @@ -22,7 +22,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 716f29ff6..e2d63007f 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' + - 'elalto': + branch: 'elalto' # apply to all jobs project: 'dcaegen2/collectors/hv-ves' mvn-settings: 'dcaegen2-collectors-hv-ves-settings' @@ -20,7 +22,7 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 2f80211ca..189de7a32 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -15,7 +15,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'dcaegen2/collectors/restconf' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 76efa4f85..4f51f2bf7 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -15,7 +15,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'dcaegen2/collectors/ves' stream: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index d8f4460af..cb0f944a3 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'el-alto': - branch: 'el-alto' + - 'elalto': + branch: 'elalto' 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..2f500630c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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 index f378ea0f8..22a68a2a0 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -23,6 +23,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'dcaegen2-platform-cli-settings' maven-deploy-properties: | deployAtEnd=true diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 213022373..613ef12d3 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'dcaegen2-platform-cli-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-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index e8cfdaf23..7b89b1aae 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -1,19 +1,12 @@ --- - project: name: dcaegen2-platform-configbinding - project-name: 'dcaegen2-platform-configbinding' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'dcaegen2/platform/configbinding' - stream: - - 'master': - branch: 'master' - - 'el-alto': - branch: 'el-alto' - mvn-settings: 'dcaegen2-platform-configbinding-settings' + # git repo + project: dcaegen2/platform/configbinding + # jenkins job prefix + project-name: dcaegen2-platform-configbinding + # push credentials + 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 # correctly defined in the job @@ -21,36 +14,41 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: ubuntu1604-docker-8c-8g + # used by tox-install.sh to specify the interpreter used to install tox + python-version: python3 + jobs: + # clm and tox + - '{project-name}-python-jobs' + # build docker image + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + stream: + - master: + branch: master + - elalto: + branch: elalto - project: name: dcaegen2-platform-configbinding-sonar - jobs: - - gerrit-maven-sonar + project: dcaegen2/platform/configbinding + project-name: dcaegen2-platform-configbinding cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'dcaegen2/platform/configbinding' - project-name: 'dcaegen2-platform-configbinding' - branch: 'master' - mvn-settings: 'dcaegen2-platform-configbinding-settings' - mvn-goals: 'clean install' + build-node: ubuntu1604-docker-8c-8g + # Sonar jobs use maven to push report + mvn-settings: dcaegen2-platform-configbinding-settings + mvn-goals: 'clean test' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-configbinding-clm + branch: master + # used by tox-install.sh to specify the interpreter used to install tox + python-version: python3 jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/configbinding - build-node: ubuntu1604-docker-8c-8g - project-name: 'dcaegen2-platform-configbinding' - branch: 'master' - mvn-settings: 'dcaegen2-platform-configbinding-settings' + - gerrit-tox-sonar - project: name: dcaegen2-platform-configbinding-info + project: dcaegen2/platform/configbinding project-name: dcaegen2-platform-configbinding + branch: master jobs: - gerrit-info-yaml-verify - project: dcaegen2/platform/configbinding - branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 77c4efc08..3851bb6fc 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'el-alto': - branch: 'el-alto' + - 'elalto': + branch: 'elalto' 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 45502a842..9b3a387fb 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -10,7 +10,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'el-alto': - branch: 'el-alto' + - 'elalto': + branch: 'elalto' 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 1d94f6c1f..ce9fb461c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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 diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 3472d79f5..2f0ec21c0 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -10,7 +10,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'el-alto': - branch: 'el-alto' + - 'elalto': + branch: 'elalto' mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' # due to a strange macro / variable translation problem this needs diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 4fa3ff572..d2774a134 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -15,12 +15,14 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'dcaegen2/services/mapper' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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 83f047c21..dc6eac1a3 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'el-alto': - branch: 'el-alto' + - 'elalto': + branch: 'elalto' # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' @@ -26,7 +26,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 48591b610..cb9130f59 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -13,13 +13,15 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - mvn-goals: 'clean package docker:build -DpushImage' + mvn-goals: 'clean package docker:build docker:push' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'dcaegen2/services/prh' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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 153562b82..31c522125 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -3,7 +3,8 @@ name: dcaegen2-services-sdk project-name: 'dcaegen2-services-sdk' jobs: - - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-verify-java': + build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true" - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: build-node: ubuntu1604-docker-8c-8g @@ -13,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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 d0b00c02e..0f8dc19ef 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -15,12 +15,14 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'dcaegen2/services/son-handler' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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..666b2177b 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -21,14 +21,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1604-docker-8c-8g' - project: name: dcaegen2-utils-sonar jobs: - gerrit-maven-sonar cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1604-docker-8c-8g project: 'dcaegen2/utils' project-name: 'dcaegen2-utils' branch: 'master' @@ -54,3 +54,36 @@ - gerrit-info-yaml-verify project: dcaegen2/utils branch: master + +- cbs_client_pypi_common: &cbs_client_pypi_common + name: cbs-client-pypi-common + # jenkins job prefix + project-name: dcaegen2-platform-cbs-client + # git repo + project: dcaegen2/utils + # push credentials + mvn-settings: dcaegen2-utils-settings + # requires centos to sign release + build-node: centos7-builder-2c-1g + tox-dir: onap-dcae-cbs-docker-client + stream: + - master: + branch: master + +- project: + name: dcaegen2-platform-cbs-client-pypi-build + <<: *cbs_client_pypi_common + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'onap-dcae-cbs-docker-client/{name}/.*' + jobs: + - gerrit-pypi-verify + - gerrit-pypi-merge: + pypi-repo: pypi-test + +- project: + name: dcaegen2-platform-cbs-client-pypi-release + <<: *cbs_client_pypi_common + jobs: + - gerrit-pypi-release-verify + - gerrit-pypi-release-merge diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 38e683d86..c0c19f138 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -17,8 +17,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' 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/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml index 1ba6d5d58..6b4698137 100644 --- a/jjb/dmaap/dmaap-buscontroller-csit.yaml +++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'dmaap-buscontroller' stream: 'master' + disabled: false functionality: - 'ssl': trigger_jobs: diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml index f01af31cd..489162a5e 100644 --- a/jjb/dmaap/dmaap-datarouter-csit.yaml +++ b/jjb/dmaap/dmaap-datarouter-csit.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'elalto': + branch: 'elalto' - 'dublin': branch: 'dublin' functionality: @@ -27,6 +27,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' - 'dublin': branch: 'dublin' functionality: diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index ca94ded1a..04f601568 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -13,11 +13,15 @@ mvn-goals: 'clean package -P docker docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dmaap/datarouter' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' - 'dublin': branch: 'dublin' mvn-settings: 'dmaap-datarouter-settings' @@ -25,31 +29,6 @@ archive-artifacts: '' - project: - name: dmaap-datarouter-casablanca - project-name: 'dmaap-datarouter' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - # - # see DMAAP-334 for more details, but - # - '{project-name}-{stream}-docker-java-daily': - # doesn't support mvn-goals override, so trying this... - - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean package -P docker docker:build -DpushImage' - # No-op - script: '/bin/true' - build-node: 'ubuntu1604-docker-8c-8g' - - project: 'dmaap/datarouter' - stream: - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'dmaap-datarouter-settings' - files: '**' - archive-artifacts: '' - -- project: name: dmaap-datarouter-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 0f5da070e..6e297e8c4 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'dmaap/messagerouter/mirroragent' stream: diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 3ef84fa0a..8eff9f67d 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'dmaap/messagerouter/msgrtr' stream: diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index b758ba5a4..66bb307f2 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -23,7 +23,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'externalapi/nbi' stream: - 'master': diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index a985a43d6..fc6044f37 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -52,3 +52,7 @@ # Jenkins jenkins-ssh-credential: 'onap-jenkins-ssh' jenkins-ssh-release-credential: 'jenkins-release' + + # SonarCloud + sonarcloud_project_organization: onap + sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index 38a06ce34..0df129366 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -101,35 +101,3 @@ settings-file: '{mvn-settings}' - 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: - - lf-infra-publish diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index 1c8242f32..eecedd464 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -771,4 +771,137 @@ - '{parent_job}' result: 'success' +- job-template: + # Job template for creating a docker manifest list + # + # The purpose of this job template is to run: + # 1. docker_push_manifest.sh script (which needs to exist in the + # project implementation repo) + + name: '{project-name}-docker-manifest-{stream}' + <<: *docker_job_boiler_plate + node: '{build-node}' + build-timeout: 15 + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + - string: + name: PARENT_JOB_NAME + default: 'none' + + disabled: '{obj:disabled}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '$GIT_URL/$PROJECT' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' + submodule-recursive: true + submodule-disable: '{submodule-disable}' + submodule-timeout: '{submodule-timeout}' + choosing-strategy: default + + + builders: + - lf-infra-docker-login: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - shell: | + #!/bin/bash -ex + export PARENT_JOB_NAME + ./docker_push_manifest.sh + +- job-template: + # Job template for staging jobs on multiple architectures + # + # The purpose of this job template is to: + # 1. Run parallel maven-docker-stage jobs for each supported architecure + # 2. Build and push a docker manifest list for the images created by + # the previous jobs + + name: '{project-name}-multiarch-docker-stage-{stream}' + node: '{build-node}' + project-type: multijob + disabled: '{obj:disabled}' + build-timeout: 15 + pattern: '**' + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + - string: + name: DOCKER_REGISTRY + default: 'none' + - string: + name: DOCKERHUB_REGISTRY + default: 'registry-1.docker.io' + + disabled: '{obj:disabled}' + + properties: + - throttle: + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - '{project-name}-.*-docker-.*' + blocking-level: 'NODE' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '$GIT_URL/$PROJECT' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' + submodule-recursive: true + submodule-timeout: 10 + submodule-disable: false + choosing-strategy: default + triggers: + - timed: '@daily' + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: + - comment-added-contains-event: + comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$' + + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: "**" + + builders: + - multijob: + name: 'build docker images' + condition: ALWAYS + execution-type: PARALLEL + projects: + - name: '{project-name}-amd64-maven-docker-stage-{stream}' + kill-phase-on: FAILURE + current-parameters: true + - name: '{project-name}-arm64-maven-docker-stage-{stream}' + kill-phase-on: NEVER + current-parameters: true + - multijob: + name: 'publish docker manifest' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: '{project-name}-docker-manifest-{stream}' + current-parameters: true + predefined-parameters: | + PARENT_JOB_NAME=$JOB_NAME + DOCKERHUB_REGISTRY=docker.io diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index c7fe3cf80..bfc9c253d 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -13,9 +13,11 @@ project-type: freestyle concurrent: true node: '{build-node}' + build-env-variables: '' pattern: '**' pom: - + mvn-opts: '' + java-opts: '' properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -53,11 +55,17 @@ - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' + - inject: + properties-content: "{build-env-variables}" - maven-target: maven-version: '{maven-version}' pom: '{obj:pom}' goals: 'clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}' + properties: + - MAVEN_OPTS='{mvn-opts}' + java-opts: + - "{java-opts}" settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -570,6 +578,8 @@ pom: mvn_properties: [] mvn-params: '' + mvn-opts: '' + java-opts: '' properties: - infra-properties: @@ -606,11 +616,21 @@ - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' + - conditional-step: + condition-kind: regex-match + regex: .*(amd64|arm64).* + label: '{project-name}' + steps: + - shell: !include-raw-escape: global-jjb/shell/docker-login.sh - maven-target: maven-version: '{maven-version}' pom: '{obj:pom}' goals: 'clean deploy -B {mvn-params} -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + properties: + - MAVEN_OPTS='{mvn-opts}' + java-opts: + - "{java-opts}" settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -1355,3 +1375,79 @@ # use default as mvn-profile if profile is not needed mvn-profile: '{mvn-profile}' mvn-params: '' + +- job-template: + # Job template for Java merge jobs on multiple architectures + # + # The purpose of this job template is to: + # 1. Run parallel {project-name}-{stream}-verify-java jobs for each supported architecture + # 2. Build and push a docker manifest list for the images created by + # the previous jobs + + name: '{project-name}-multiarch-{stream}-merge-java' + node: '{build-node}' + project-type: multijob + disabled: '{obj:disabled}' + pattern: '**' + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + - string: + name: DOCKER_REGISTRY + default: 'none' + - string: + name: DOCKERHUB_REGISTRY + default: 'registry-1.docker.io' + + properties: + - throttle: + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - '{project-name}-.*-merge-.*' + blocking-level: 'NODE' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{pattern}' + + builders: + - multijob: + name: 'build docker images' + condition: ALWAYS + execution-type: PARALLEL + projects: + - name: '{project-name}-amd64-{stream}-merge-java' + kill-phase-on: FAILURE + current-parameters: true + - name: '{project-name}-arm64-{stream}-merge-java' + kill-phase-on: NEVER + current-parameters: true + - multijob: + name: 'publish docker manifest' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: '{project-name}-docker-manifest-{stream}' + current-parameters: true + predefined-parameters: | + PARENT_JOB_NAME=$JOB_NAME + DOCKERHUB_REGISTRY=docker.io diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index fcbf745fc..e6f074407 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -2,6 +2,52 @@ # vim: sw=2 ts=2 sts=2 et : - job-template: + # + # job template for verifying gerrit changeset by shell script + # + # Required Variables: + # project-name: name of project + # area: area of project covered with this verification job + # project: name of scm repository to work on + # stream: name of stream used (set the same as branch if you're not sure) + # branch: git branch to work on + # script: build script to execute + # Optional Variables: + # pattern: trigger job only if modification covered file in pattern + # build-node: label(flavor) of jenkins slave + name: '{project-name}-{stream}-{area}-verify-shell' + node: '{build-node}' + type: freestyle + + pattern: '**' + + 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: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{pattern}' + + builders: + - shell: '{script}' + + publishers: + - lf-infra-publish + +- job-template: # Job template for merging a submission. triggered on # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then # run script diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml index 9d2323aaf..bf7e768a9 100644 --- a/jjb/holmes/holmes-csit.yaml +++ b/jjb/holmes/holmes-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'holmes-rule-management' stream: 'master' + disabled: true functionality: - 'sanity-check': trigger_jobs: 'holmes-rule-management-master-docker-java-daily' diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index e245103b9..8c10af1f8 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -1,7 +1,7 @@ --- - job-template: name: '{project-name}-{stream}-verify-csit-{functionality}' - disabled: false + disabled: '{disabled}' project-type: freestyle build-node: 'ubuntu1604-docker-8c-8g' @@ -261,7 +261,7 @@ - job-template: name: '{project-name}-{stream}-csit-{functionality}' - disabled: false + disabled: '{disabled}' project-type: freestyle build-node: 'ubuntu1604-docker-8c-8g' 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 a9dafdc32..4069552fb 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 @@ -9,8 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true -P docker' + maven-version: "mvn35" - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: logging-analytics/pomba/pomba-aai-context-builder stream: - 'master': 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 0677cb027..f8d94e75a 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: logging-analytics/pomba/pomba-audit-common stream: - 'master': 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 7b7176435..938d5f963 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml @@ -9,8 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true -P docker' + maven-version: "mvn35" - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: logging-analytics/pomba/pomba-context-aggregator stream: - 'master': 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 c2915b090..8c077fa04 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 @@ -9,8 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true -P docker' + maven-version: "mvn35" - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: logging-analytics/pomba/pomba-network-discovery-context-builder stream: - 'master': 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 c18615667..21491c303 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 @@ -9,8 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true -P docker' + maven-version: "mvn35" - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: logging-analytics/pomba/pomba-sdc-context-builder stream: - 'master': 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 681fbdd0f..3765a33b9 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 @@ -9,8 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true -P docker' + maven-version: "mvn35" - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: logging-analytics/pomba/pomba-sdnc-context-builder stream: - 'master': diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index aa8c24600..bead4e5d8 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'logging-analytics' stream: - 'master': diff --git a/jjb/modeling/build-modeling-genericparser-docker-image.sh b/jjb/modeling/build-modeling-etsicatalog-docker-image.sh index d570d18a2..d570d18a2 100644 --- a/jjb/modeling/build-modeling-genericparser-docker-image.sh +++ b/jjb/modeling/build-modeling-etsicatalog-docker-image.sh diff --git a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml index 032881c2c..76ebd4f20 100644 --- a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml +++ b/jjb/modeling/modeling-etsicatalog-csit.yaml @@ -1,13 +1,13 @@ --- - project: - name: modeling-genericparser-csit + name: modeling-etsicatalog-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'modeling-genericparser' + project-name: 'modeling-etsicatalog' stream: 'master' functionality: - 'sanity-check': - trigger_jobs: 'modeling-genericparser-master-docker-java-version-shell-daily' + trigger_jobs: 'modeling-etsicatalog-master-docker-java-version-shell-daily' robot-options: '' branch: 'master'
\ No newline at end of file diff --git a/jjb/modeling/modeling-toscaparsers-genericparser.yaml b/jjb/modeling/modeling-etsicatalog.yaml index 88ab33255..2c04e233c 100644 --- a/jjb/modeling/modeling-toscaparsers-genericparser.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -1,15 +1,15 @@ --- - project: - name: modeling-genericparser - project-name: 'modeling-genericparser' - project: 'modeling/genericparser' + name: modeling-etsicatalog + project-name: 'modeling-etsicatalog' + project: 'modeling/etsicatalog' stream: - 'master': branch: 'master' - mvn-settings: 'modeling-genericparser-settings' + mvn-settings: 'modeling-etsicatalog-settings' subproject: - - 'genericparser': + - 'etsicatalog': path: '.' pattern: '**' jobs: @@ -24,40 +24,40 @@ docker-pom: 'pom.xml' mvn-goals: 'install' script: - !include-raw-escape: 'build-modeling-genericparser-docker-image.sh' + !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh' build-node: ubuntu1604-docker-8c-8g files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g - project: - name: modeling-genericparser-sonar + name: modeling-etsicatalog-sonar jobs: - gerrit-maven-sonar cron: '@daily' build-node: centos7-redis-4c-4g - project: 'modeling/genericparser' - project-name: 'modeling-genericparser' + project: 'modeling/etsicatalog' + project-name: 'modeling-etsicatalog' branch: 'master' - mvn-settings: 'modeling-genericparser-settings' + mvn-settings: 'modeling-etsicatalog-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: - name: modeling-genericparser-clm + name: modeling-etsicatalog-clm jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: modeling/genericparser - project-name: 'modeling-genericparser' + project: modeling/etsicatalog + project-name: 'modeling-etsicatalog' build-node: centos7-redis-4c-4g branch: 'master' - mvn-settings: 'modeling-genericparser-settings' + mvn-settings: 'modeling-etsicatalog-settings' - project: - name: modeling-genericparser-info - project-name: modeling-genericparser + name: modeling-etsicatalog-info + project-name: modeling-etsicatalog jobs: - gerrit-info-yaml-verify - project: modeling/genericparser + project: modeling/etsicatalog branch: master diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml index bdb16ab4a..42a665727 100644 --- a/jjb/msb/msb-csit.yaml +++ b/jjb/msb/msb-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'msb' stream: 'master' + disabled: true functionality: - 'sanity-check': trigger_jobs: diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 3c91a978c..3e2fe170f 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -14,8 +14,8 @@ maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - mvn-pom: 'distributions/msb-apigateway/pom.xml' - mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker' + mvn-pom: 'distributions/msb-discovery/pom.xml' + mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker' project: 'msb/discovery' stream: - 'master': diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 03aab824e..8d8b72e07 100755 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -5,14 +5,12 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./ocata/docker/*.* chmod 755 ./windriver/docker/*.* chmod 755 ./pike/docker/*.* chmod 755 ./starlingx/docker/*.* #chmod 755 ./lenovo/docker/*.* chmod 755 ./fcaps/docker/*.* -./ocata/docker/build_image.sh ./windriver/docker/build_image.sh ./pike/docker/build_image.sh ./starlingx/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml index 10946318a..3deb163b9 100644 --- a/jjb/multicloud/multicloud-azure-csit.yaml +++ b/jjb/multicloud/multicloud-azure-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-azure' stream: 'master' + disabled: true functionality: - 'functionality1': trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 6fd0ccfb1..388f94c30 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -31,7 +31,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/multicloud/multicloud-k8s-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml index a5a1540e7..84072303c 100644 --- a/jjb/multicloud/multicloud-k8s-csit.yaml +++ b/jjb/multicloud/multicloud-k8s-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-k8s' stream: 'master' + disabled: true functionality: - 'functionality1': trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily' diff --git a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml b/jjb/multicloud/multicloud-k8s-kud-deployment.yaml deleted file mode 100644 index d5334647d..000000000 --- a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- 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-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index c015a674a..914c2bdac 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -11,6 +11,11 @@ - '{project-name}-{stream}-docker-golang-shell-daily': script: !include-raw-escape: 'build-multicloud-k8s-docker-image.sh' + - '{project-name}-{stream}-{area}-verify-shell': + area: kud-deployment + script: + !include-raw-escape: 'kud-deployment.sh' + build-node: ubuntu1604-builder-4c-4g project: 'multicloud/k8s' subproject: - validation-scripts: @@ -22,7 +27,7 @@ mvn-settings: 'multicloud-k8s-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1604-builder-8c-8g #- project: # name: multicloud-k8s-arm64 diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml deleted file mode 100644 index d44ac3c51..000000000 --- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- project: - name: multicloud-openstack-ocata-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'multicloud-ocata' - stream: 'master' - functionality: - - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' -# - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' - - 'hpa-discovery': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' -# - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml index 2e3685680..180114a90 100644 --- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-pike' stream: 'master' + disabled: true functionality: - 'functionality1': trigger_jobs: diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 6bbbd94ba..c29787214 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -27,6 +27,8 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g @@ -73,6 +75,7 @@ nexus-iq-namespace: 'onap-' project: multicloud/openstack/vmware project-name: 'multicloud-openstack-vmware' + build-node: 'ubuntu1604-builder-4c-4g' branch: 'master' mvn-settings: 'multicloud-openstack-vmware-settings' diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml index fa8dfd454..c24627634 100644 --- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-windriver' stream: 'master' + disabled: true functionality: - 'functionality1': trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 7f11cb499..42d26721e 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -14,14 +14,6 @@ branch: 'master' mvn-settings: 'multicloud-openstack-settings' subproject: - - 'ocata': - path: 'ocata' - pattern: 'ocata/**' - pom: 'ocata/pom.xml' - - 'ocata_share': - path: 'ocata' - pattern: 'share/**' - pom: 'ocata/pom.xml' - 'pike': path: 'pike' pattern: 'pike/**' @@ -74,7 +66,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: 'ubuntu1604-memcached-4c-4g' @@ -97,19 +89,6 @@ # files: '**' # archive-artifacts: '' # -- project: - name: multicloud-openstack-ocata-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'multicloud/openstack' - project-name: 'multicloud-openstack-ocata' - branch: 'master' - mvn-params: '-f ocata/pom.xml' - mvn-settings: 'multicloud-openstack-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: name: multicloud-openstack-windriver-sonar diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml index a0dbc8184..c0299f6d2 100644 --- a/jjb/music/music-csit.yaml +++ b/jjb/music/music-csit.yaml @@ -5,11 +5,10 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'music' + disabled: true stream: 'master' functionality: - 'music-test-plan': trigger_jobs: 'music-master-docker-version-java-daily' robot-options: '' branch: 'master' - - diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index f981b2123..496cd60cd 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -9,6 +9,13 @@ 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-version-plugin: true + mvn-pom: 'jar/pom.xml' + mvn-params: '-f jar/pom.xml' + pattern: 'jar/**' project: 'music' stream: - 'jar-master': diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index abf404f0b..5bbaae3ca 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -22,7 +22,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'music' stream: - 'master': diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index eb40189a8..a2933fb0f 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -14,3 +14,11 @@ jobs: - '{project-name}-{stream}-review': build_script: '{offline_review_bootstrap}' + +- project: + name: offline-installer-info + project-name: offline-installer + jobs: + - gerrit-info-yaml-verify + project: oom/offline-installer + branch: master diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index b5f915094..b4d3ca797 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -15,6 +15,9 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'oparent' stream: - 'master': diff --git a/jjb/optf/build-optf-fgps-docker-image.sh b/jjb/optf/build-optf-fgps-docker-image.sh index 6c93c8b9d..2d7b4f62d 100644 --- a/jjb/optf/build-optf-fgps-docker-image.sh +++ b/jjb/optf/build-optf-fgps-docker-image.sh @@ -6,5 +6,5 @@ CURRENTDIR="$(pwd)" echo $CURRENTDIR chmod 755 ./*.* - +cd ./valetapi ./build-dockers.sh diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml index ae0a790e5..4bf51652f 100644 --- a/jjb/optf/optf-cmso-csit.yaml +++ b/jjb/optf/optf-cmso-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'cmso': trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 2c2b24ddf..caf4de5a4 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -10,21 +10,22 @@ project-name: 'optf-cmso' jobs: - gerrit-maven-stage: - maven-versions-plugin: true + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: false + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: false + 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}-docker-java-properties-daily': - setVersion: 'DoSetVersion' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - maven-properties: | - cmso.registry=$ - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g build-node: ubuntu1604-docker-8c-8g project: 'optf/cmso' stream: diff --git a/jjb/optf/optf-fgps-csit.yaml b/jjb/optf/optf-fgps-csit.yaml deleted file mode 100644 index a60c453ef..000000000 --- a/jjb/optf/optf-fgps-csit.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- 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 index b0a373b7b..9443e444d 100644 --- a/jjb/optf/optf-fgps.yaml +++ b/jjb/optf/optf-fgps.yaml @@ -20,6 +20,8 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml index 498878638..57bc512b2 100644 --- a/jjb/optf/optf-has-csit.yaml +++ b/jjb/optf/optf-has-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'optf-has' + disabled: true stream: - 'master': branch: master diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 831988da7..8fc49df1b 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -24,7 +24,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml index bb31f31dc..426186778 100644 --- a/jjb/optf/optf-osdf-csit.yaml +++ b/jjb/optf/optf-osdf-csit.yaml @@ -5,11 +5,10 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'optf-osdf' + disabled: true stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'osdf': trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index a5f5e413e..b5b4dc5bd 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -23,7 +23,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g 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 fc221507b..6823ed92f 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -25,12 +25,14 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/apex-pdp' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-apex-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 048d95ef9..8a13714ed 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-api + name: policy-api-elalto project-name: 'policy-api' jobs: - '{project-name}-{stream}-verify-java' @@ -19,7 +19,66 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/api' + stream: + - 'elalto': + branch: 'elalto' + mvn-settings: 'policy-api-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: policy-api + project-name: 'policy-api' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + project-name: 'policy-api-amd64' + docker-pom: 'pom.xml' + mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + build-node: ubuntu1604-docker-8c-8g + pattern: 'do_not_match_any_file' + - '{project-name}-{stream}-merge-java': + project-name: 'policy-api-arm64' + docker-pom: 'pom.xml' + mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + build-node: ubuntu1604-docker-arm64-4c-2g + pattern: 'do_not_match_any_file' + - '{project-name}-multiarch-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + project-name: 'policy-api-amd64' + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + container-public-registry: 'docker.io' + container-staging-registry: 'docker.io' + cron: '' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'do_not_match_any_file' + - gerrit-maven-docker-stage: + project-name: 'policy-api-arm64' + build-node: ubuntu1604-docker-arm64-4c-2g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + container-public-registry: 'docker.io' + container-staging-registry: 'docker.io' + cron: '' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'do_not_match_any_file' + - '{project-name}-docker-manifest-{stream}': + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-multiarch-docker-stage-{stream}' +# - '{project-name}-gerrit-release-jobs': +# build-node: centos7-docker-8c-8g project: 'policy/api' stream: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index faf8b8a9b..d908b072a 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -10,12 +10,14 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/common' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-common-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index b0b61db0c..3579ab3c1 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -10,8 +10,8 @@ functionality: - 'health' trigger_jobs: - - 'policy-engine-{stream}-merge-scm-mvn-script' - - 'policy-drools-pdp-{stream}-merge-scm-mvn-script' + - 'policy-engine-{stream}-merge-java' + - 'policy-drools-pdp-{stream}-merge-java' - 'policy-drools-applications-{stream}-merge-java' robot-options: '' build-timeout: 40 diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 4c2c03e62..7209baff1 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -19,12 +19,14 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/distribution' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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 196fb2b96..4113bfd0a 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-docker-base-common + name: policy-docker-base-common-elalto project-name: 'policy-docker' jobs: - '{project-name}-{stream}-verify-java' @@ -16,7 +16,64 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g + + project: 'policy/docker' + stream: + - 'elalto': + branch: 'elalto' + mvn-settings: 'policy-docker-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: policy-docker-base-common + project-name: 'policy-docker' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + project-name: 'policy-docker-amd64' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + build-node: ubuntu1604-docker-8c-8g + pattern: 'do_not_match_any_file' + - '{project-name}-{stream}-merge-java': + project-name: 'policy-docker-arm64' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + build-node: ubuntu1604-docker-arm64-4c-2g + pattern: 'do_not_match_any_file' + - '{project-name}-multiarch-{stream}-merge-java' + - gerrit-maven-docker-stage: + project-name: 'policy-docker-arm64' + build-node: ubuntu1604-docker-arm64-4c-2g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + container-public-registry: 'docker.io' + container-staging-registry: 'docker.io' + cron: '' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'do_not_match_any_file' + - gerrit-maven-docker-stage: + project-name: 'policy-docker-amd64' + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + container-public-registry: 'docker.io' + container-staging-registry: 'docker.io' + cron: '' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'do_not_match_any_file' + - '{project-name}-docker-manifest-{stream}': + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-multiarch-docker-stage-{stream}' +# - '{project-name}-gerrit-release-jobs': +# build-node: centos7-docker-8c-8g project: 'policy/docker' stream: diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index a6dd4d869..47f27ffac 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -19,12 +19,14 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/drools-applications' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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 182604496..b1ddf3452 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -19,12 +19,14 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/drools-pdp' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-drools-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 32651a792..bbdcbcff2 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -19,12 +19,14 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/engine' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-engine-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index d2a7da091..f60572a17 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -10,12 +10,14 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/models' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-models-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index a9ab05f4b..65ff979eb 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -19,12 +19,14 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/pap' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-pap-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 5445a7113..ef6891cce 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -10,12 +10,14 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/parent' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' 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 a30790492..11d2f496a 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -19,12 +19,14 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'policy/xacml-pdp' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-xacml-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index ca0a873a4..f15dfc0d5 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -9,13 +9,23 @@ subproject-name: 'onap-sdk' jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'ecomp-sdk/pom.xml' + mvn-params: '-f ecomp-sdk/pom.xml' + pattern: 'ecomp-sdk/**' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'portal/sdk' stream: - 'master': branch: 'master' + - 'release-2.6.0': + branch: 'release-2.6.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 2073e0a66..0fcb0a572 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -40,8 +40,9 @@ - project: name: 'portal-coverity' jobs: - - onap-gerrit-maven-coverity + - 'onap-gerrit-maven-coverity' cron: '@daily' + max-git-repo-age-hours: 48 build-node: 'ubuntu1604-builder-4c-4g' project: 'portal' project-name: 'portal' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 62896212f..806b1cc68 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'sdc/jtosca' stream: diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 557962fc3..c7a3424ab 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'sdc/sdc-distribution-client' stream: diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 55633ee41..98725b895 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'sdc/sdc-tosca' stream: diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 3f37206cf..c02e03b90 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -28,21 +28,21 @@ project-name: 'sdc' jobs: - '{project-name}-{stream}-verify-java': - mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - '{project-name}-{stream}-sdc-merge-java': build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' - mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -84,20 +84,34 @@ project-name: 'sdc' branch: 'master' mvn-settings: 'sdc-settings' - mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' - project: - name: sdc-clm + name: sdc-clm-catalog jobs: - gerrit-maven-clm: build-timeout: 120 submodule-timeout: 30 - mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + mvn-params: '-P catalog -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' nexus-iq-namespace: 'onap-' project: sdc - project-name: 'sdc' + project-name: 'sdc-catalog' + build-node: ubuntu1604-docker-8c-8g + branch: 'master' + mvn-settings: 'sdc-settings' + +- project: + name: sdc-clm-onboarding + jobs: + - gerrit-maven-clm: + build-timeout: 120 + submodule-timeout: 30 + mvn-params: '-P onboarding -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + nexus-iq-namespace: 'onap-' + project: sdc + project-name: 'sdc-onboarding' build-node: ubuntu1604-docker-8c-8g branch: 'master' mvn-settings: 'sdc-settings' @@ -115,7 +129,10 @@ project-name: 'sdc' build-node: ubuntu1604-docker-8c-8g jobs: - - gerrit-whitesource-scan + - gerrit-whitesource-scan: + build-timeout: 120 + submodule-timeout: 30 + java-opts: '-Xmx2048m' mvn-settings: 'sdc-settings' wss-product-name: 'sdc' mvn-clean-install: true diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 739beaf5b..edb5b90a8 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -21,12 +21,16 @@ mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'sdnc/apps' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' + - 'elalto-fluorine': + branch: 'elalto-fluorine' mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index a65e78065..d7d816d5f 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -9,12 +9,16 @@ sign-artifacts: true build-node: centos7-builder-4c-4g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'sdnc/northbound' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' + - 'elalto-fluorine': + branch: 'elalto-fluorine' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 695fa4ba1..d74810537 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -18,11 +18,15 @@ maven-version: "mvn35" maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'sdnc/oam' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' + - 'elalto-fluorine': + branch: 'elalto-fluorine' mvn-settings: 'sdnc-oam-settings' maven-version: "mvn35" files: '**' diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index e4551d77f..c76685dbb 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -11,4 +11,6 @@ functionality: - 'integration-testing': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' + - 'integration-etsi-testing': + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' robot-options: '' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 2d71fa2d8..8ad44cb8d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -9,10 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'so/libs' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'so-libs-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -52,3 +56,4 @@ - gerrit-info-yaml-verify project: so/libs branch: master + branch: elalto diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index a99048f66..d36fdd859 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -21,10 +21,14 @@ mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'so' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' @@ -82,8 +86,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'so-settings' - project: @@ -93,3 +95,4 @@ - gerrit-info-yaml-verify project: so branch: master + branch: elalto diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml index 20ba913b7..47c727cb6 100644 --- a/jjb/testsuite/testsuite-heatbridge.yaml +++ b/jjb/testsuite/testsuite-heatbridge.yaml @@ -15,6 +15,8 @@ branch: 'master' - 'dublin': branch: 'dublin' + - 'elalto': + branch: 'elalto' 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 5cd681510..f9b756bee 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -2,24 +2,26 @@ - project: name: testsuite-python-testing-utils project-name: 'testsuite-python-testing-utils' - python-version: python2 + python-version: python3 jobs: - '{project-name}-{subproject}-python-staging-{stream}' - '{project-name}-{subproject}-python-release-{stream}' project: 'testsuite/python-testing-utils' subproject: - 'robotframework-onap': - tox-dir: robotframework-onap/ - tox-envs: '' + tox-dir: './robotframework-onap/' + tox-envs: 'py3' stream: - 'master': branch: 'master' - 'dublin': branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'testsuite-python-testing-utils-settings' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'centos7-builder-4c-4g' - project: name: testsuite-python-testing-utils-verify @@ -30,8 +32,10 @@ branch: 'master' - 'dublin': branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'testsuite-python-testing-utils-settings' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'centos7-builder-4c-4g' subproject: - 'robotframework-onap': path: 'robotframework-onap' @@ -40,19 +44,6 @@ - '{project-name}-{stream}-{subproject}-verify-python' - project: - name: testsuite-python-testing-utils-master-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: testsuite/python-testing-utils - project-name: 'testsuite-python-testing-utils' - build-node: 'ubuntu1604-builder-4c-4g' - stream: - - 'master': - branch: 'master' - mvn-settings: 'testsuite-python-testing-utils-settings' - -- project: name: testsuite-python-testing-utils-info project-name: testsuite-python-testing-utils jobs: diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 0b1e6cb14..0bde8c1a8 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -35,6 +35,8 @@ branch: 'master' - 'dublin': branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'testsuite-settings' - project: diff --git a/jjb/usecases/config-over-netconf.yaml b/jjb/usecases/config-over-netconf.yaml new file mode 100644 index 000000000..d3ab0ecdd --- /dev/null +++ b/jjb/usecases/config-over-netconf.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: usecases-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'usecases' + stream: + - 'master': + branch: 'master' + functionality: + - 'config-over-netconf': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' + robot-options: '' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 0030c0f03..1442e89eb 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -31,7 +31,7 @@ !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh' build-node: ubuntu1604-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index f9d8f72b6..799a18ec8 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -25,7 +25,7 @@ !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh' build-node: ubuntu1604-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index fe6587ce7..fdb61ec57 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -26,7 +26,7 @@ !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh' build-node: ubuntu1604-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index ef69fbcdd..317f8ad66 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -27,7 +27,7 @@ !include-raw-escape: 'build-nfvo-catalog-docker-image.sh' build-node: ubuntu1604-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 034177e77..b6ba9e9e6 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -22,7 +22,7 @@ !include-raw-escape: 'build-nfvo-db-docker-image.sh' build-node: ubuntu1604-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g - project: diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 4a47a2a29..6b836dd9e 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -28,7 +28,7 @@ !include-raw-escape: 'build-gvnfm-driver-docker-image.sh' build-node: ubuntu1604-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml index 9be81e0d1..591a8de79 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml @@ -5,10 +5,10 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'vfc-nfvo-driver-vnfm-svnfm' + disabled: true stream: 'master' functionality: - 'sanity-check': trigger_jobs: 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' - 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 349b532b6..0b121e172 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -21,7 +21,7 @@ mvn-pom: 'zte/vmanager/pom.xml' mvn-params: '-f zte/vmanager/pom.xml' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g 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 2fe88456d..0feca60ee 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -21,7 +21,7 @@ !include-raw-escape: 'build-nfvo-lcm-docker-image.sh' build-node: ubuntu1604-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml index 591ad8236..ed38bd43c 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'vfc-nfvo-wfengine' + disabled: true stream: 'master' functionality: - 'sanity-check' @@ -13,4 +14,3 @@ - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily' robot-options: '' branch: 'master' - diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 3a75eca5e..b0845fd71 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -21,12 +21,14 @@ mvn-params: '-P docker' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'vid' stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' @@ -60,7 +62,6 @@ mvn-settings: 'vid-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-params: '-Dskip.npm' - project: name: vid-clm @@ -72,7 +73,6 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vid-settings' - mvn-params: '-Dskip.npm' - project: name: vid-info diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml index 93cbf9fc9..a0679bbd5 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'vnfsdk-pkgtools' + disabled: true stream: 'master' functionality: - 'sanity-check': diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml index e34fd7403..9ff4e8509 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'vnfsdk-refrepo' stream: 'master' + disabled: true functionality: - 'sanity-check': trigger_jobs: '{project-name}-{stream}-merge-java' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh b/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh new file mode 100644 index 000000000..4a2a76a21 --- /dev/null +++ b/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh @@ -0,0 +1,75 @@ +#!/bin/bash +set -x + +#3rd party +cmake_build_type=RELEASE +LEVELDB_VER=1.22 +THRIFT_VER=0.12.0 +JSON_VER=3.5.0 +SPDLOG_VER=1.3.1 + +sudo yum install -y cppcheck bison libcurl-devel; yum clean all +sudo pip install gcovr + +#cmake +cd /tmp/ +wget https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.tar.gz +tar xzvf cmake*.tar.gz +sudo rpm -e cmake +sudo ln -s $(pwd)/cmake-3.15.3-Linux-x86_64/bin/cmake /usr/bin/cmake + +#leveldb +cd /tmp +curl -o leveldb.zip https://codeload.github.com/google/leveldb/zip/$LEVELDB_VER +unzip leveldb.zip +rm leveldb.zip +mv leveldb-$LEVELDB_VER leveldb +mkdir leveldb/_build +cd leveldb/_build;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DCMAKE_POSITION_INDEPENDENT_CODE=ON; make -j 10; sudo make install + +#json +cd /tmp +curl -o json.zip https://codeload.github.com/nlohmann/json/zip/v$JSON_VER +unzip json.zip +rm json.zip +mv json-$JSON_VER json +cd json;mkdir _build +cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DJSON_BuildTests=OFF;make -j 10;sudo make install + +#spdlog +cd /tmp +curl -o spdlog.zip https://codeload.github.com/gabime/spdlog/zip/v$SPDLOG_VER +unzip spdlog.zip +rm spdlog.zip +mv spdlog-$SPDLOG_VER spdlog +cd spdlog;mkdir _build +cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_BENCH=OFF -DSPDLOG_BUILD_TESTS=OFF; make -j 10; sudo make install + +#thrift +cd /tmp +curl -o thrift.zip https://codeload.github.com/apache/thrift/zip/v$THRIFT_VER +unzip thrift.zip +rm thrift.zip +mv thrift-$THRIFT_VER thrift +cd thrift;mkdir _build +cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DBUILD_PYTHON=OFF -DBUILD_JAVA=OFF -DBUILD_C_GLIB=OFF -DWITH_LIBEVENT=OFF -DWITH_ZLIB=OFF -DWITH_OPENSSL=OFF -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON;make -j 10;sudo make install + +#verify/sonar +if [[ "${JOB_NAME}" == "vnfsdk-ves-agent-cmake-sonar" ]]; then +echo "sonar" +mkdir -p ${BUILD_DIR} +cppcheck --enable=all --inconclusive --xml --xml-version=2 --output-file=${BUILD_DIR}/cppcheck.xml . + +cd ${BUILD_DIR} +cat >> sonar-project.properties <<EOF +sonar.cfamily.gcov.reportsPath=${BUILD_DIR}/coverage +sonar.cppcheck.reportPath=${BUILD_DIR}/cppcheck.xml +sonar.exclusions=**/gen-cpp/**/*,**/build/**/* +sonar.projectBaseDir=${WORKSPACE}/veslibrary/ves_cpplibrary +sonar.cfamily.threads=4 +EOF + +ls ${BUILD_DIR}/sonar-project.properties +cat ${BUILD_DIR}/sonar-project.properties + +fi diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index 6611f5e9b..8bcbd0b11 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -11,6 +11,12 @@ mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - 'gerrit-cmake-verify': + build-timeout: 30 + pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh + build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build + make-opts: -j6 + build-node: centos7-builder-4c-4g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -31,6 +37,17 @@ name: vnfsdk-ves-agent-sonar jobs: - gerrit-maven-sonar + - gerrit-cmake-sonar: + build-timeout: 60 + pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh + build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build + cmake-opts: '-DENABLE_COVERAGE=on -DCOVERAGE_DIR=coverage' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-organization: '{sonarcloud_project_organization}' + sonarcloud-project-key: '{sonarcloud_project_organization}_vnfsdk-ves-agent' + make-opts: -j6 + stream: master + build-node: centos7-builder-4c-4g cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/ves-agent' diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index 943ea87ec..b730ea87c 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -17,6 +17,8 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g docker-pom: 'pom.xml' mvn-profile: 'default' @@ -37,6 +39,7 @@ name: vvp-validation-scripts-tracability-matrix project: 'vvp/validation-scripts' project-name: 'vvp-validation-scripts' + build-node: ubuntu1604-docker-8c-8g mvn-settings: 'vvp-validation-scripts-settings' mvn-global-settings: 'global-settings' stream: diff --git a/packer/common-packer b/packer/common-packer -Subproject 1cb0f11add7a8494b6b22f4d55a5ab3f7b1ee3c +Subproject 57648e1600c3c2457900ad4872f26d8f5cd679c diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index ddfe3a998..a9280815f 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -1,2 +1,65 @@ --- - import_playbook: ../common-packer/provision/baseline.yaml + +- hosts: all + become_user: root + become_method: sudo + + tasks: + - name: Update and upgrade apt packages + apt: + upgrade: yes + update_cache: yes + become: true + when: ansible_distribution == 'Ubuntu' + + - name: Install python-tox + pip: + name: tox + state: present + become: true + + - apt_repository: + repo: ppa:jonathonf/python-3.6 + state: present + become: true + when: ansible_distribution == 'Ubuntu' + + - name: Install Python 3.6 and packages + apt: + name: + - python3.6 + - python3.6-dev + - python3.6-tk + - libssl-dev + - libmysqlclient-dev + - gcc + become: true + when: ansible_distribution == 'Ubuntu' + + - name: Install base packages + apt: + name: + - unzip + - xz-utils + - libxml-xpath-perl + - wget + - make + - npm + - sshuttle + - netcat + - libssl-dev + - libffi-dev + become: true + when: ansible_distribution == 'Ubuntu' + + - name: Install autorelease support packages + apt: + name: + - xmlstarlet + - xvfb + - crudini + - maven + - python-ncclient + become: true + when: ansible_distribution == 'Ubuntu' diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index d38ff8f6d..76e0cbbd1 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -84,6 +84,7 @@ name: - python3.6 - python3.6-dev + - python3.6-tk - libssl-dev - libmysqlclient-dev - gcc diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh index 5db7f33e4..eed10c4ea 100644 --- a/shell/maven-coverity.sh +++ b/shell/maven-coverity.sh @@ -23,6 +23,29 @@ SUBMISSION_ATTEMPTS=5 SUBMISSION_INITIAL_REST_INTERVAL=30 # seconds, will be doubled after each attempt #----------------------------------------------------------------------------- +# Check for git repo changes within the last $MAX_GIT_REPO_AGE_HOURS hours +# +# It makes sense to set the value twice the 'cron' interval for the job (e.g. +# if 'cron: @daily', then MAX_GIT_REPO_AGE_HOURS=48) + +if ! [[ "${MAX_GIT_REPO_AGE_HOURS:=0}" =~ ^[0-9]+$ ]]; then + echo '[ERROR] MAX_GIT_REPO_AGE_HOURS must be non-negative integer.' \ + >&2 + exit 1 +fi + +if [ ${MAX_GIT_REPO_AGE_HOURS:=0} -ne 0 ]; then + LAST_COMMIT_AGE=$(( $(date +%s) - $(git log -1 --pretty=format:%ct) )) + + if [ $LAST_COMMIT_AGE -gt $(( MAX_GIT_REPO_AGE_HOURS *60*60 )) ]; then + echo '[NOTICE] Git repository did not have any commits last' \ + "${MAX_GIT_REPO_AGE_HOURS} hours - no need to re-analyse it." \ + >&2 + exit 0 + fi +fi + +#----------------------------------------------------------------------------- # Process parameters for JS/TS/Python/Ruby/PHP files analysis if [ -n "${SEARCH_PATHS:=}" ]; then @@ -30,7 +53,9 @@ if [ -n "${SEARCH_PATHS:=}" ]; then 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 + echo "[ERROR] '${SEARCH_PATH}' from \$SEARCH_PATHS is not an" \ + "existing directory." \ + >&2 exit 1 fi done @@ -69,7 +94,9 @@ if [ "${DRY_RUN}" != 'true' ]; then | 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 + echo "[WARNING] Upload quota reached. Next upload permitted at" \ + $(echo "${CURL_OUTPUT}" | jq '.next_upload_permitted_at') \ + >&2 exit 1 fi fi @@ -84,7 +111,7 @@ curl \ --fail \ --form "project=${COVERITY_PROJECT_NAME}" \ --form "token=${COVERITY_TOKEN}" \ - --output 'coverity_tool.tgz' \ + --output '/tmp/coverity_tool.tgz' \ 'https://scan.coverity.com/download/linux64' curl \ @@ -95,23 +122,24 @@ curl \ --form "project=${COVERITY_PROJECT_NAME}" \ --form "token=${COVERITY_TOKEN}" \ --form 'md5=1' \ - --output 'coverity_tool.md5' \ + --output '/tmp/coverity_tool.md5' \ 'https://scan.coverity.com/download/linux64' -echo -n ' coverity_tool.tgz' >> 'coverity_tool.md5' -md5sum --check 'coverity_tool.md5' +echo -n ' /tmp/coverity_tool.tgz' >> '/tmp/coverity_tool.md5' +md5sum --check '/tmp/coverity_tool.md5' tar \ --extract \ --gunzip \ - --file='coverity_tool.tgz' + --file='/tmp/coverity_tool.tgz' \ + --directory='/tmp' -COVERITY_BUILD_TOOL_DIRECTORY=$( +COVERITY_BUILD_TOOL_DIRECTORY='/tmp/'$( head -1 <( \ tar \ --list \ --gunzip \ - --file='coverity_tool.tgz' + --file='/tmp/coverity_tool.tgz' ) ) COVERITY_BINARY_DIRECTORY="${COVERITY_BUILD_TOOL_DIRECTORY}bin" @@ -119,7 +147,7 @@ test -d "${COVERITY_BINARY_DIRECTORY}" \ || exit 1 export PATH="${PATH}:${COVERITY_BINARY_DIRECTORY}" -rm 'coverity_tool.tgz' +rm '/tmp/coverity_tool.tgz' #----------------------------------------------------------------------------- # Build @@ -220,11 +248,14 @@ if [ "${DRY_RUN}" != 'true' ]; then HTTP_RESPONSE=$(echo -n "${CURL_OUTPUT}" | head -n -1 | tr -d '\n') if [ x"${HTTP_RESPONSE}" != x"Build successfully submitted." ]; then - echo "Coverity Scan service responded with '${HTTP_RESPONSE}' while 'Build successfully submitted.' expected." >&2 + echo "[ERROR] Coverity Scan service responded with '${HTTP_RESPONSE}'" \ + "while 'Build successfully submitted.' expected." \ + >&2 exit 1 fi + + echo "[INFO] Build successfully submitted to Coverity Scan server." >&2 fi #----------------------------------------------------------------------------- - exit 0 diff --git a/shell/pypi-dist-build.sh b/shell/pypi-dist-build.sh index bc3d4ae65..cd4afb62d 100644 --- a/shell/pypi-dist-build.sh +++ b/shell/pypi-dist-build.sh @@ -2,7 +2,7 @@ # Script to build PyPI artifacts set -e -x -o pipefail -virtualenv -p "$PYTHON_VERSION" /tmp/v/twine +virtualenv -p "$PYTHON" /tmp/v/twine source "/tmp/v/twine/bin/activate" pip install twine wheel diff --git a/shell/pypi-publish.sh b/shell/pypi-publish.sh index 2510ed38b..e097b1687 100644 --- a/shell/pypi-publish.sh +++ b/shell/pypi-publish.sh @@ -2,7 +2,7 @@ # Script to publush PyPI artifacts set -e -x -o pipefail -virtualenv -p "$PYTHON_VERSION" /tmp/v/twine +virtualenv -p "$PYTHON" /tmp/v/twine source "/tmp/v/twine/bin/activate" pip install twine |