Merge "Fix nested trigger_jobs (U-V)"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Mon, 24 Sep 2018 17:27:13 +0000 (17:27 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 24 Sep 2018 17:27:13 +0000 (17:27 +0000)
220 files changed:
jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg [moved from jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg with 56% similarity]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg [moved from jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg with 56% similarity]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg [moved from jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg with 56% similarity]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg [moved from jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg with 56% similarity]
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
jenkins-config/global-vars-production.sh
jenkins-config/global-vars-sandbox.sh
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-csit.yaml
jjb/aaf/aaf-sms-csit.yaml
jjb/aaf/aaf-sms.yaml
jjb/aaf/aaf-sshsm.yaml
jjb/aaf/build-sshsm-docker-images.sh [new file with mode: 0755]
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-aai-config.yaml [deleted file]
jjb/aai/aai-aai-data.yaml [deleted file]
jjb/aai/aai-babel.yaml
jjb/aai/aai-cacher.yaml [moved from jjb/sdnc/sdnc-features.yaml with 52% similarity]
jjb/aai/aai-chameleon.yaml [new file with mode: 0644]
jjb/aai/aai-csit.yaml
jjb/aai/aai-data-router.yaml
jjb/aai/aai-eis.yaml [deleted file]
jjb/aai/aai-esr-gui.yaml
jjb/aai/aai-esr-server.yaml
jjb/aai/aai-event-client.yaml
jjb/aai/aai-gallifrey.yaml [new file with mode: 0644]
jjb/aai/aai-gap.yaml [deleted file]
jjb/aai/aai-graphadmin.yaml
jjb/aai/aai-graphgraph.yaml [deleted file]
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-router-core-service.yaml
jjb/aai/aai-search-data-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-tabular-data-service.yaml [deleted file]
jjb/aai/aai-test-config.yaml [deleted file]
jjb/aai/aai-traversal.yaml
jjb/aai/aai-validation.yaml [new file with mode: 0644]
jjb/appc/appc-csit.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-parent.yaml [new file with mode: 0644]
jjb/ccsdk/apps.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/platform-plugins.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ccsdk/storage-pgaas.yaml [deleted file]
jjb/ccsdk/utils.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/ci-management/ci-management.yaml
jjb/cli/cli.yaml
jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml [new file with mode: 0644]
jjb/dcaegen2/apod-analytics.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-deployments.yaml
jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml [deleted file]
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2.yaml
jjb/demo/demo.yaml
jjb/dmaap/dmaap-buscontroller-csit.yaml [new file with mode: 0644]
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-datarouter-csit.yaml [new file with mode: 0644]
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml
jjb/dmaap/dmaap-kafka-docker.yaml [new file with mode: 0644]
jjb/dmaap/dmaap-kafka.yaml [new file with mode: 0644]
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-docker.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
jjb/doc/doc-install-plantuml.sh [new file with mode: 0644]
jjb/doc/doc-templates-rtd.yaml
jjb/doc/doc-tools.yaml [deleted file]
jjb/doc/doc.yaml
jjb/global-jjb
jjb/global-macros.yaml
jjb/global-templates-c.yaml
jjb/global-templates-helm.yaml [new file with mode: 0644]
jjb/global-templates-java.yaml
jjb/global-templates-python.yaml
jjb/global-templates-script.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-dsa.yaml
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/integration/integration-seccom.yaml [deleted file]
jjb/integration/integration-templates-docker.yaml
jjb/integration/integration.yaml
jjb/lab/lab-templates.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml [deleted file]
jjb/logging-analytics/logging-analytics.yaml
jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-csit.yaml
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/build-multicloud-azure-docker-image.sh [new file with mode: 0644]
jjb/multicloud/multicloud-azure-java.yaml [new file with mode: 0644]
jjb/multicloud/multicloud-azure-python.yaml [new file with mode: 0644]
jjb/multicloud/multicloud-csit.yaml
jjb/multicloud/multicloud-k8s.yaml [new file with mode: 0644]
jjb/multicloud/multicloud-openstack-ocata-csit.yaml
jjb/multicloud/multicloud-openstack-pike-csit.yaml
jjb/multicloud/multicloud-openstack-vmware-csit.yaml
jjb/multicloud/multicloud-openstack-windriver-csit.yaml
jjb/music/music-csit.yaml
jjb/music/music-distributed-kv-store-csit.yaml
jjb/music/music-distributed-kv-store.yaml
jjb/music/music-prom.yaml
jjb/music/music-trigger.yaml [new file with mode: 0644]
jjb/oom/oom-helm.yaml [new file with mode: 0644]
jjb/oom/oom-oneclick-config.yaml
jjb/openci/create-ape.sh
jjb/openci/openci-onap-daily-jobs.yaml
jjb/optf/optf-has-csit.yaml
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-core.yaml
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-xacml-pdp.yaml
jjb/portal-sdk/portal-sdk-csit.yaml
jjb/portal/portal-csit.yaml
jjb/portal/portal.yaml
jjb/sdc/sdc-csit.yaml
jjb/sdc/sdc-dcae-d-ci.yaml
jjb/sdc/sdc-dcae-d-dt-be-main.yaml
jjb/sdc/sdc-dcae-d-dt-be-property.yaml
jjb/sdc/sdc-dcae-d-dt.yaml [new file with mode: 0644]
jjb/sdc/sdc-dcae-d-fe.yaml
jjb/sdc/sdc-dcae-d-tosca-lab.yaml
jjb/sdc/sdc-jtosca.yaml
jjb/sdc/sdc-onap-ui-angular.yaml [new file with mode: 0644]
jjb/sdc/sdc-onap-ui-common.yaml [new file with mode: 0644]
jjb/sdc/sdc-onap-ui-react.yaml [new file with mode: 0644]
jjb/sdc/sdc-onap-ui.yaml
jjb/sdc/sdc-sdc-distribution-client.yaml
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-pubsub.yaml
jjb/sdc/sdc-sdc-titan-cassandra.yaml
jjb/sdc/sdc-sdc-tosca.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-csit.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/sdnc/sdnc-plugins.yaml [deleted file]
jjb/so/so-chef-repo.yaml [deleted file]
jjb/so/so-csit.yaml
jjb/so/so-docker-config.yaml [deleted file]
jjb/so/so-libs.yaml
jjb/so/so-so-config.yaml [deleted file]
jjb/testsuite/testsuite-properties.yaml [deleted file]
jjb/testsuite/testsuite-python-testing-utils.yaml
jjb/testsuite/testsuite.yaml
jjb/ui/ui-dmaapbc.yaml
jjb/usecaseui/usecase-ui.yaml
jjb/vfc/build-nfvo-db-docker-image.sh [new file with mode: 0755]
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-nfvo-catalog.yaml
jjb/vfc/vfc-nfvo-db.yaml [new file with mode: 0644]
jjb/vfc/vfc-nfvo-driver-ems-java.yaml
jjb/vfc/vfc-nfvo-driver-sfc.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vfc/vfc-nfvo-multivimproxy.yaml
jjb/vfc/vfc-nfvo-resmanagement.yaml
jjb/vfc/vfc-nfvo-wfengine-java.yaml
jjb/vid/vid.yaml
jjb/vnfsdk/vnfsdk-ice-python.yaml
jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
jjb/vvp/vvp-cms.yaml
jjb/vvp/vvp-devkit.yaml
jjb/vvp/vvp-documentation.yaml
jjb/vvp/vvp-engagementmgr.yaml
jjb/vvp/vvp-gitlab.yaml
jjb/vvp/vvp-image-scanner.yaml
jjb/vvp/vvp-jenkins.yaml
jjb/vvp/vvp-portal.yaml
jjb/vvp/vvp-postgresql.yaml
jjb/vvp/vvp-test-engine.yaml
jjb/vvp/vvp-validation-scripts.yaml
packer/common-packer
packer/provision/local-docker.yaml
shell/helm-repo-init.sh [new file with mode: 0644]
shell/publish_helm_charts.sh [new file with mode: 0755]

index 09c0807..41440ff 100644 (file)
@@ -1,3 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180328-1726
-LABELS=centos7-basebuild-2c-1g centos7-builder-2c-1g
+LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2
index 4030359..dbabd5f 100644 (file)
@@ -1,3 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180328-1726
-LABELS=centos7-basebuild-4c-4g centos7-builder-4c-4g
+LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
index 4c0766c..975b749 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - redis - 20180101-1003
+IMAGE_NAME=CentOS 7 - redis - 20180805-2225
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4
index 3fb352b..22bc7c4 100644 (file)
@@ -1,4 +1,4 @@
-IMAGE_NAME=Ubuntu 16.04 - docker - 20180101-1003
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1
index dbfd730..60167f2 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - docker - 20180101-1003
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
index 539f859..f5b09e5 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - helm - 20180521-1225
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - 20180807-1251
 LABELS=ubuntu1604-helm-2c-1g
 HARDWARE_ID=v2-highcpu-2
index 972dbf9..cc5d85e 100644 (file)
@@ -11,5 +11,7 @@ LOGS_SERVER=https://logs.onap.org
 NEXUS_URL=https://nexus.onap.org
 NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
+SIGUL_BRIDGE_IP=10.30.104.3
+SIGUL_KEY=onap-release-2018
 SILO=production
 SONAR_URL=https://sonar.onap.org
index 589dc6e..83ce04b 100644 (file)
@@ -11,6 +11,7 @@ LOGS_SERVER=https://logs.onap.org
 NEXUS_URL=https://nexus.onap.org
 NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
+SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-test
 SILO=sandbox
 SONAR_URL=https://sonar.onap.org
index a4256ee..e877b52 100644 (file)
@@ -3,7 +3,7 @@
     name: aaf-authz
     project-name: 'aaf-authz'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +12,7 @@
           settings: '{mvn-settings}'
           script:
             !include-raw-escape: 'build-aaf-docker-image.sh'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'aaf/authz'
     stream:
       - 'master':
index 8886447..f1e9570 100644 (file)
@@ -3,7 +3,7 @@
     name: aaf-cadi
     project-name: 'aaf-cadi'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index aec49b3..42aefcf 100644 (file)
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'aafapi':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
     branch: 'master'
index 474ca8b..4e7f3ab 100644 (file)
@@ -8,7 +8,6 @@
       stream: 'master'
       functionality:
         - 'sms-test-plan':
-            trigger_jobs:
-              - 'aaf-sms-master-docker-golang-shell-daily'
+            trigger_jobs: 'aaf-sms-master-docker-golang-shell-daily'
       robot-options: ''
       branch: 'master'
index b8ccf73..e0b7988 100644 (file)
@@ -5,7 +5,6 @@
     subproject: 'aaf-sms-client'
     path: 'sms-service/src'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily':
index 4bab946..0782b9d 100644 (file)
@@ -2,13 +2,15 @@
 - project:
     name: aaf-sshsm
     project-name: 'aaf-sshsm'
-    build-timeout: 60
+    build-timeout: 120
     project: 'aaf/sshsm'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-c':
          script:
             !include-raw-escape: 'build-sshsm.sh'
+      - '{project-name}-{stream}-docker-c-shell-daily':
+         script:
+            !include-raw-escape: 'build-sshsm-docker-images.sh'
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/aaf/build-sshsm-docker-images.sh b/jjb/aaf/build-sshsm-docker-images.sh
new file mode 100755 (executable)
index 0000000..b0c8882
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+echo 'Building AAF/sshsm containers'
+cd bin
+chmod 755 build_images.sh
+./build_images.sh
index c458f9f..56b9925 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-aai-common-master
     project-name: 'aai-aai-common'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -14,6 +14,7 @@
       - 'beijing':
           branch: 'beijing'
     mvn-settings: 'aai-aai-common-settings'
+    mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
@@ -30,3 +31,4 @@
     mvn-settings: 'aai-aai-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/aai/aai-aai-config.yaml
deleted file mode 100644 (file)
index 52cf5f3..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-aai-config
-    project-name: 'aai-aai-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/aai-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-aai-config-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/aai/aai-aai-data.yaml
deleted file mode 100644 (file)
index e012c05..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-aai-data
-    project-name: 'aai-aai-data'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/aai-data'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-aai-data-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
index 2166499..081bb27 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-babel
     project-name: 'aai-babel'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
similarity index 52%
rename from jjb/sdnc/sdnc-features.yaml
rename to jjb/aai/aai-cacher.yaml
index 12accbb..2df4345 100644 (file)
@@ -1,37 +1,36 @@
 ---
 - project:
-    name: sdnc-features
-    project-name: 'sdnc-features'
+    name: aai-cacher-master
+    project-name: 'aai-cacher'
     jobs:
       - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'sdnc/features'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'aai/cacher'
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'sdnc-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
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
+    mvn-settings: 'aai-cacher-settings'
+    mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
-    name: sdnc-features-sonar
+    name: aai-cacher-sonar
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
     build-node: ubuntu1604-builder-4c-4g
-    project: 'sdnc/features'
-    project-name: 'sdnc-features'
+    project: 'aai/cacher'
+    project-name: 'aai-cacher'
     branch: 'master'
-    mvn-settings: 'sdnc-features-settings'
+    mvn-settings: 'aai-cacher-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
new file mode 100644 (file)
index 0000000..040d3bb
--- /dev/null
@@ -0,0 +1,20 @@
+---
+- project:
+    name: aai-chameleon
+    project-name: 'aai-chameleon'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'clean package dockerfile:build dockerfile:push'
+    project: 'aai/chameleon'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-chameleon-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
index b723410..059340f 100644 (file)
           branch: beijing
     functionality:
       - 'resources':
-          trigger_jobs:
-            - 'aai-resources-{stream}-aai-docker-java-version-daily'
+          trigger_jobs: 'aai-resources-{stream}-aai-docker-java-daily'
       - 'traversal':
-          trigger_jobs:
-            - 'aai-traversal-{stream}-aai-docker-java-version-daily'
+          trigger_jobs: 'aai-traversal-{stream}-aai-docker-java-daily'
       - 'esr-server':
-          trigger_jobs:
-            - 'aai-esr-server-{stream}-docker-java-daily'
+          trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily'
     robot-options: ''
 
index 7d8a780..785a86e 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-data-router-master
     project-name: 'aai-data-router'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-eis.yaml b/jjb/aai/aai-eis.yaml
deleted file mode 100644 (file)
index 66f20e5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-eis
-    project-name: 'aai-eis'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/eis'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-eis-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
index ccc77be..84206f3 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-esr-gui
     project-name: 'aai-esr-gui'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 0cfa1c8..fec9583 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-esr-server-master
     project-name: 'aai-esr-server'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index e345ea1..9f8ea55 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-event-client-master
     project-name: 'aai-event-client'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -28,4 +28,4 @@
     branch: 'master'
     mvn-settings: 'aai-event-client-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
new file mode 100644 (file)
index 0000000..cda1885
--- /dev/null
@@ -0,0 +1,20 @@
+---
+- project:
+    name: aai-gallifrey
+    project-name: 'aai-gallifrey'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'clean package dockerfile:build dockerfile:push'
+          build-node: 'ubuntu1604-docker-8c-8g'
+    project: 'aai/gallifrey'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-gallifrey-settings'
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/aai/aai-gap.yaml b/jjb/aai/aai-gap.yaml
deleted file mode 100644 (file)
index 4854bd0..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-gap
-    project-name: 'aai-gap'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/gap'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gap-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
index bd45414..25366b7 100644 (file)
@@ -1,14 +1,36 @@
 ---
 - project:
-    name: aai-graphadmin
+    name: aai-graphadmin-master
     project-name: 'aai-graphadmin'
     jobs:
       - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
     project: 'aai/graphadmin'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-graphadmin-settings'
+    mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aai-graphadmin-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aai/graphadmin'
+    project-name: 'aai-graphadmin'
+    branch: 'master'
+    mvn-settings: 'aai-graphadmin-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
deleted file mode 100644 (file)
index 5e5ef52..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-graphgraph
-    project-name: 'aai-graphgraph'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/graphgraph'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-graphgraph-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
index 7d5cd9e..b2f4517 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-logging-service-master
     project-name: 'aai-logging-service'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 1cfe7ca..93eef33 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-model-loader-master
     project-name: 'aai-model-loader'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 8dfd630..e88c0f9 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-resources
     project-name: 'aai-resources'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -18,6 +18,7 @@
       - 'beijing':
           branch: 'beijing'
     mvn-settings: 'aai-resources-settings'
+    mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
@@ -34,3 +35,4 @@
     mvn-settings: 'aai-resources-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
index 3108e4b..4ea031a 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-rest-client-master
     project-name: 'aai-rest-client'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index a128471..45d20fe 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-router-core-master
     project-name: 'aai-router-core'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 6e3692f..4434a23 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-search-data-service-master
     project-name: 'aai-search-data-service'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index bdc94b3..c646492 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-sparky-be-master
     project-name: 'aai-sparky-be'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 8fd4d22..7036e58 100644 (file)
@@ -4,7 +4,7 @@
     project-name: 'aai-sparky-fe'
     build-node: 'centos7-builder-4c-4g'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-tabular-data-service.yaml b/jjb/aai/aai-tabular-data-service.yaml
deleted file mode 100644 (file)
index d673f83..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-tabular-data-service
-    project-name: 'aai-tabular-data-service'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/tabular-data-service'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-tabular-data-service-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-test-config.yaml b/jjb/aai/aai-test-config.yaml
deleted file mode 100644 (file)
index 19cf2b4..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-test-config
-    project-name: 'aai-test-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/test-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-test-config-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
index 75704ee..830ff43 100644 (file)
@@ -3,7 +3,7 @@
     name: aai-traversal-master
     project-name: 'aai-traversal'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -18,6 +18,7 @@
       - 'beijing':
           branch: 'beijing'
     mvn-settings: 'aai-traversal-settings'
+    mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
@@ -34,3 +35,4 @@
     mvn-settings: 'aai-traversal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
new file mode 100644 (file)
index 0000000..d66e77a
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: aai-validation
+    project-name: 'aai-validation'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aai/validation'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-validation-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aai-validation-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aai/validation'
+    project-name: 'aai-validation'
+    branch: 'master'
+    mvn-settings: 'aai-validation-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index e0dfbfe..7e4e9cd 100644 (file)
@@ -8,10 +8,7 @@
     stream:
       - 'master':
           branch: master
-      - 'beijing':
-          branch: 'beijing'
     functionality:
       - 'healthcheck':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
index 964f15a..81dc8f4 100644 (file)
@@ -4,7 +4,7 @@
     name: appc-deployment
     project-name: 'appc-deployment'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -29,8 +29,6 @@
     jobs:
       - 'docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
     project: 'appc/deployment'
     stream:
       - 'master':
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
new file mode 100644 (file)
index 0000000..d42d207
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- project:
+    name: appc-parent
+    project-name: 'appc-parent'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'appc/parent'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'appc-parent-settings'
+    build-node: ubuntu1604-builder-2c-1g
index a407649..7417aff 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-apps
     project-name: 'ccsdk-apps'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-apps-docker
+    project-name: 'ccsdk-apps'
+    jobs:
+      - 'docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+      - 'docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'ccsdk/apps'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ccsdk-apps-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: queue-docker-4c-4g
index aa5aff0..5949e1a 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-distribution
     project-name: 'ccsdk-distribution'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 5febe0f..68dfad7 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-features
     project-name: 'ccsdk-features'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 033f1c1..2efb907 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-parent
     project-name: 'ccsdk-parent'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 20d0f8e..45f6389 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-platform-plugins
     project-name: 'ccsdk-platform-plugins'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    build-node: centos7-redis-4c-4g
 
 - project:
     name: ccsdk-platform-plugins-sonar
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: centos7-redis-4c-4g
     project: 'ccsdk/platform/plugins'
     project-name: 'ccsdk-platform-plugins'
     branch: 'master'
index e6abc07..fc3bfe1 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-sli-adaptors
     project-name: 'ccsdk-sli-adaptors'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index ebfc371..f2d7a7d 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-sli-core
     project-name: 'ccsdk-sli-core'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index f800970..c990628 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-sli-northbound
     project-name: 'ccsdk-sli-northbound'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 50210d5..17812bd 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-sli-plugins
     project-name: 'ccsdk-sli-plugins'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml
deleted file mode 100644 (file)
index 86e8331..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- project:
-    name: ccsdk-storage-pgaas
-    project-name: 'ccsdk-storage-pgaas'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'ccsdk/storage/pgaas'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-storage-pgaas-settings'
-    # due to a strange macro / variable translation problem this needs to be
-    # passed as a string block to properly get the properties correctly defined
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: ccsdk-storage-pgaas-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'ccsdk/storage/pgaas'
-    project-name: 'ccsdk-storage-pgaas'
-    branch: 'master'
-    mvn-settings: 'ccsdk-storage-pgaas-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 519e596..192899a 100644 (file)
@@ -3,7 +3,7 @@
     name: ccsdk-utils
     project-name: 'ccsdk-utils'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 6faebf7..52c496d 100644 (file)
@@ -14,7 +14,9 @@
 
     platforms:
       - centos-7
+      - centos-7-arm64
       - ubuntu-16.04
+      - ubuntu-18.04-arm64
     templates: builder
 
 - project:
@@ -32,7 +34,9 @@
 
     platforms:
       - centos-7
+      - centos-7-arm64
       - ubuntu-16.04
+      - ubuntu-18.04-arm64
     templates: docker
 
 - project:
index c39cb7e..d0a29e4 100644 (file)
@@ -11,4 +11,4 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
-    jjb-version: 2.0.3
+    jjb-version: 2.2.1
index d6fc2e7..c5a04ee 100644 (file)
@@ -4,7 +4,7 @@
     name: cli
     project-name: 'cli'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml b/jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml
new file mode 100644 (file)
index 0000000..5fad587
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: dcae-bulkpm-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcae-bulkpm'
+    stream: 'master'
+    functionality:
+      - 'bulkpm-suite':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+    branch: 'master'
index c11a28d..3b98812 100644 (file)
     jobs:
       - gerrit-maven-clm
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-verify-java-skip-tests':
-          mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean deploy'
+      - '{project-name}-{stream}-verify-java':
+          mvn-params: '-DskipTests=true'
+      - '{project-name}-{stream}-merge-java'
 
 - project:
     name: dcaegen2-analytics-tca-sonar
index 2210f09..d075f52 100644 (file)
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-maven-clm
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
-          mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean deploy'
+      - '{project-name}-{stream}-docker-java-shell-daily':
+          mvn-goals: 'clean deploy docker:build -DpushImage'
+          # No-op
+          script: '/bin/true'
 
 - project:
     name: dcaegen2-analytics-tca-gen2-sonar
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/analytics/tca-gen2'
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
index f6b363a..4a02979 100644 (file)
@@ -13,7 +13,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-maven-clm
       - '{project-name}-{stream}-release-version-java-daily'
@@ -27,7 +27,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/collectors/datafile'
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
new file mode 100644 (file)
index 0000000..821fa7e
--- /dev/null
@@ -0,0 +1,14 @@
+- project:
+    name: dcaegen2-collectors-hv-ves-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-collectors-hv-ves'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+            - 'dcaegen2-collectors-hv-ves-master-merge-java'
+    robot-options: ''
index dbe6439..2508076 100644 (file)
     files: '**'
     maven-deploy-properties: |
       deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-maven-clm
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean deploy'
-- project:
-    name: dcaegen2-collectors-hv-ves-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/collectors/hv-ves'
-    project-name: 'dcaegen2-collectors-hv-ves'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-shell-daily':
+          mvn-goals: 'clean deploy -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+          # No-op
+          script: '/bin/true'
+
index 99df41f..fbad319 100644 (file)
@@ -27,7 +27,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/collectors/ves'
     project-name: 'dcaegen2-collectors-ves'
     branch: 'master'
index a83a10f..6ffa6b4 100644 (file)
@@ -21,3 +21,4 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+    build-timeout: 180
index 65cba2b..8ac744a 100644 (file)
@@ -11,6 +11,7 @@
           mvn-goals: 'clean package docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dcaegen2/platform/inventory-api'
     stream:
index 33fcb11..7c66bfd 100644 (file)
@@ -11,6 +11,7 @@
           mvn-goals: 'clean package docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dcaegen2/platform/servicechange-handler'
     stream:
index aed6187..322c079 100644 (file)
@@ -11,6 +11,7 @@
           mvn-goals: 'clean package docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'dcaegen2/services/mapper'
     stream:
       - 'master':
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
deleted file mode 100644 (file)
index a3137d6..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: dcaegen2-services-pm-mapper
-    # job template iterators
-    project-name: 'dcaegen2-services-pm-mapper'
-    stream:
-      - 'master':
-          branch: 'master'
-    # apply to all jobs
-    project: 'dcaegen2/services/pm-mapper'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-    jobs:
-      - gerrit-maven-clm
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-verify-java':
-          mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean deploy'
-
-- project:
-    name: dcaegen2-services-pm-mapper-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/services/pm-mapper'
-    project-name: 'dcaegen2-services-pm-mapper'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index ad1fa4a..0c54a1b 100644 (file)
@@ -7,10 +7,6 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
 
     project: 'dcaegen2/services/prh'
     stream:
@@ -28,7 +24,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/services/prh'
     project-name: 'dcaegen2-services-prh'
     branch: 'master'
index 5cde1b0..0341dbf 100644 (file)
@@ -3,7 +3,7 @@
     name: dcaegen2
     project-name: 'dcaegen2'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index a86ded7..ef38e5f 100644 (file)
@@ -4,7 +4,7 @@
     name: demo
     project-name: 'demo'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
new file mode 100644 (file)
index 0000000..1ba6d5d
--- /dev/null
@@ -0,0 +1,20 @@
+---
+- project:
+    name: dmaap-buscontroller-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dmaap-buscontroller'
+    stream: 'master'
+    functionality:
+      - 'ssl':
+          trigger_jobs:
+            - '{project-name}-{stream}-release-java-daily-checkstyle'
+      - 'with_mr':
+          trigger_jobs:
+            - '{project-name}-{stream}-release-java-daily-checkstyle'
+      - 'with_dr':
+          trigger_jobs:
+            - '{project-name}-{stream}-release-java-daily-checkstyle'
+    robot-options: ''
+    branch: 'master'
index f4602da..2af0e8d 100644 (file)
@@ -4,7 +4,7 @@
     name: dmaap-buscontroller
     project-name: 'dmaap-buscontroller'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -16,6 +16,7 @@
           mvn-goals: 'clean package -P docker docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dmaap/buscontroller'
     stream:
diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml
new file mode 100644 (file)
index 0000000..d6c4765
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: dmaap-datarouter-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dmaap-datarouter'
+    stream: 'master'
+    functionality:
+      - 'dr-suite':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+    branch: 'master'
index c61122c..da0088d 100644 (file)
@@ -14,6 +14,7 @@
           mvn-goals: 'clean package -P docker docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dmaap/datarouter'
     stream:
index 8eb2508..c49f042 100644 (file)
@@ -3,7 +3,7 @@
     name: dmaap-dbcapi
     project-name: 'dmaap-dbcapi'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
new file mode 100644 (file)
index 0000000..39202f2
--- /dev/null
@@ -0,0 +1,20 @@
+---
+
+- project:
+    name: dmaap-kafka-docker
+    project-name: 'dmaap-kafka-docker'
+    jobs:
+      - '{project-name}-{stream}-docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'dmaap/kafka11aaf'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: 'docker'
+    build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
new file mode 100644 (file)
index 0000000..0a15b18
--- /dev/null
@@ -0,0 +1,25 @@
+---
+- project:
+    name: dmaap-kafka
+    project-name: 'dmaap-kafka'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'dmaap/kafka11aaf'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+
+- project:
+    name: dmaap-kafka-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'dmaap/kafka11aaf'
+    project-name: 'dmaap-kafka'
+    branch: 'master'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c656c96..e6c85ac 100644 (file)
@@ -3,7 +3,7 @@
     name: dmaap-messagerouter-dmaapclient
     project-name: 'dmaap-messagerouter-dmaapclient'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 0b1cfb3..18d9d1c 100644 (file)
@@ -4,7 +4,7 @@
     name: dmaap-messagerouter-docker
     project-name: 'dmaap-messagerouter-docker'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-{stream}-docker-java-daily':
index 9ba4f7a..433df2b 100644 (file)
@@ -3,7 +3,7 @@
     name: dmaap-messagerouter-messageservice
     project-name: 'dmaap-messagerouter-messageservice'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 0ab449a..8fd7f94 100644 (file)
@@ -3,7 +3,7 @@
     name: dmaap-messagerouter-mirroragent
     project-name: 'dmaap-messagerouter-mirroragent'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 05e9ea9..54657c4 100644 (file)
@@ -3,7 +3,7 @@
     name: dmaap-messagerouter-msgrtr
     project-name: 'dmaap-messagerouter-msgrtr'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/doc/doc-install-plantuml.sh b/jjb/doc/doc-install-plantuml.sh
new file mode 100644 (file)
index 0000000..0f5aedd
--- /dev/null
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -x
+if [ ! -d /usr/share/plantuml ]
+       then
+       sudo mkdir -p /usr/share/plantuml
+       cd /usr/share/plantuml
+       sudo wget https://nexus.onap.org/service/local/repositories/central/content/net/sourceforge/plantuml/plantuml/8059/plantuml-8059.jar
+       sudo mv plantuml-8059.jar plantuml.jar
+       fi
+
+if [ ! -f /usr/bin/plantuml ]
+       then
+       sudo touch /usr/bin/plantuml
+       sudo chmod +w /usr/bin/plantuml
+       echo "#!/bin/bash" > /tmp/x.$$
+       echo "java -jar /usr/share/plantuml/plantuml.jar \$@"  >> /tmp/x.$$
+       sudo cp /tmp/x.$$ /usr/bin/plantuml
+       sudo chmod +x /usr/bin/plantuml
+       fi
index 4bc2d11..77cea69 100644 (file)
@@ -68,6 +68,7 @@
           else
               git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
           fi
+      - shell: !include-raw: doc-install-plantuml.sh
       - shell: |
           #!/bin/bash
           virtualenv $WORKSPACE/venv-tox
diff --git a/jjb/doc/doc-tools.yaml b/jjb/doc/doc-tools.yaml
deleted file mode 100644 (file)
index f3112cd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- project:
-    name: doc-tools
-    project-name: 'doc-tools'
-    jobs:
-      - gerrit-maven-clm
-    project: 'doc/tools'
-    mvn-settings: 'doc-tools-settings'
-    stream:
-      - master:
-          branch: 'master'
index 538885f..53409de 100644 (file)
@@ -3,7 +3,6 @@
     name: doc
     project-name: 'doc'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-rtd':
           build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-merge-rtd'
index 5ca1149..75cd590 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5ca1149a99351cc571d21b315e4acecae6b109b5
+Subproject commit 75cd5909da184179c77a55d1909f7159d9eea34b
index 1f751da..d32e53d 100644 (file)
           goals: '--version'
 
 - builder:
-    name: maven-docker-push-release
+    name: maven-set-release-version
     builders:
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy -B -P {mvn-profile}'
+          goals: 'versions:set versions:update-child-modules versions:commit -B'
+          properties:
+            - 'newVersion=${{release_version}}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-          properties:
-            - maven.test.skip=true
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10002
 
 - builder:
-    name: maven-docker-push-daily
+    name: maven-docker-push-release
     builders:
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
+          goals: 'clean deploy -B -P {mvn-profile}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
           properties:
+            - maven.test.skip=true
             - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
+            - docker.push.registry=nexus3.onap.org:10002
 
 - builder:
-    name: maven-docker-push-daily-test
+    name: maven-docker-push-daily
     builders:
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy -B -P {mvn-profile}'
+          goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
                 - compare-type: 'ANT'
                   pattern: '{files}'
 
+- trigger:
+    name: gerrit-trigger-helm-patch-submitted
+    triggers:
+      - gerrit:
+          server-name: '{server}'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: '^verify-helm$'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '{files}'
+
+- trigger:
+    name: gerrit-trigger-helm-patch-merged
+    triggers:
+      - gerrit:
+          server-name: '{server}'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: '^remerge-helm$'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '{files}'
+
 - trigger:
     name: gerrit-trigger-release-manually
     triggers:
index fc89511..764b0a0 100644 (file)
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
+
+
+- job-template:
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. run a specified shell builder
+    #
+
+    name: '{project-name}-{stream}-docker-c-shell-daily'
+    project-type: freestyle
+    node: 'ubuntu1604-docker-8c-8g'
+    disabled: false
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - docker-login
+      - shell: '{script}'
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
new file mode 100644 (file)
index 0000000..f1b015a
--- /dev/null
@@ -0,0 +1,194 @@
+---
+###########
+# ANCHORS #
+###########
+- helm_job_boiler_plate: &helm_job_boiler_plate
+    name: helm_job_boiler_plate
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    submodule-recursive: true
+
+    # default params for helm jobs
+    pre_build_script: ''
+    build_script: ''
+    post_build_script: ''
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: '{project}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    publishers:
+      - lf-infra-publish
+
+#################
+# JOB TEMPLATES #
+#################
+- job-template:
+    name: '{project-name}-{stream}-verify-helm'
+    # Job template for helm verify jobs
+
+    <<: *helm_job_boiler_plate
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    triggers:
+      - gerrit-trigger-helm-patch-submitted:
+          status-context: '{project}-Helm-Verify'
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+
+    builders:
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+
+- job-template:
+    name: '{project-name}-{stream}-merge-helm'
+    # Job template for Helm merge jobs
+
+    <<: *helm_job_boiler_plate
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    triggers:
+      - gerrit-trigger-helm-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+
+    builders:
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+      - lf-infra-create-netrc:
+          server-id: oom-helm
+      - inject:
+          properties-content: |
+            BUILD_TYPE=snapshot
+      - shell: '{obj:post_build_script}'
+      - lf-provide-maven-settings-cleanup
+
+- job-template:
+    name: '{project-name}-{stream}-stage-helm'
+    # Job template for Helm stage jobs
+
+    <<: *helm_job_boiler_plate
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    triggers:
+      - pollscm:
+          cron: '0 22 * * *'
+      - gerrit:
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: '^stage-helm$'
+
+    builders:
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+      - lf-infra-create-netrc:
+          server-id: oom-helm
+      - inject:
+          properties-content: |
+            BUILD_TYPE=staging
+      - shell: '{obj:post_build_script}'
+      - lf-provide-maven-settings-cleanup
+
+- job-template:
+    name: '{project-name}-{subproject}-{stream}-verify-helm'
+    # Job template for helm verify jobs
+
+    <<: *helm_job_boiler_plate
+
+    disabled: true
+    builders:
+      - shell: '{pre_build_script}'
+      - shell: '{build_script}'
+      - shell: '{post_build_script}'
+
+- job-template:
+    name: '{project-name}-{subproject}-{stream}-merge-helm'
+    # Job template for helm merge jobs
+
+    <<: *helm_job_boiler_plate
+
+    disabled: true
+    builders:
+      - shell: '{pre_build_script}'
+      - shell: '{build_script}'
+      - shell: '{post_build_script}'
+
+- job-template:
+    name: '{project-name}-{stream}-update-helm-weekly'
+    # Job template for weekly helm update jobs
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+    <<: *helm_job_boiler_plate
+
+    disabled: true
+    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
+          choosing-strategy: default
+
+    builders:
+      - shell: '{pre_build_script}'
+      - shell: '{build_script}'
+      - shell: '{post_build_script}'
+
+    triggers:
+      # 11 AM UTC
+      - timed: 'H 11 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
index ef91f81..ea8f008 100644 (file)
@@ -1,69 +1,5 @@
 ---
-- job-template:
-    # Job template for Java verify jobs
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean install -DskipTests=true
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-verify-java-skip-tests'
-
-    project-type: freestyle
-    concurrent: true
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean install -DskipTests=true -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-          maven-opts:
-            - maven.test.skip=true
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
+- job-template: &verify_java_defaults
     # Job template for Java verify jobs
     #
     # The purpose of this job template is to run:
@@ -77,6 +13,8 @@
     project-type: freestyle
     concurrent: true
     node: '{build-node}'
+    pattern: '**'
+    pom:
 
     properties:
       - infra-properties:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '**'
+          files: '{obj:pattern}'
 
     builders:
       - provide-maven-settings:
           settings-file: '{mvn-settings}'
       - 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}'
           settings: '{mvn-settings}'
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
+    <<: *verify_java_defaults
     name: '{project-name}-{stream}-verify-java-checkstyle'
-    project-type: freestyle
-    concurrent: true
-    node: '{build-node}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-      - maven-params:
-          mvn-params: '{mvn-params}'
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean install -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
       - checkstyle-result
 
-- job-template:
-    # Job template for Java verify jobs that takes a maven template
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean install -P {mvn-profile}
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-verify-profile-java'
-
-    project-type: freestyle
-    concurrent: true
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{files}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean install -P {mvn-profile} -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
 - job-template:
     # Job template for Java verify jobs with POM not at the root
     #
     #     pattern:   ant file-path pattern relative to the workspace used to
     #                trigger the job
 
+    <<: *verify_java_defaults
     name: '{project-name}-{stream}-{subproject}-verify-java'
 
-    project-type: freestyle
-    concurrent: true
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{pattern}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean install -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
 - job-template:
     # Job template for Java daily release jobs
     #
           steps:
             - inject:
                 properties-file: version.properties
-            - maven-target:
+            - maven-set-release-version:
                 maven-version: '{maven-version}'
-                goals: 'versions:set versions:update-child-modules versions:commit -B'
-                properties:
-                  - 'newVersion=${{release_version}}'
-                settings: '{mvn-settings}'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
+                mvn-settings: '{mvn-settings}'
+                pom:
       - maven-target:
           maven-version: '{maven-version}'
           goals: 'clean deploy -B
 
       - inject:
           properties-file: version.properties
-      - maven-target:
+      - maven-set-release-version:
           maven-version: '{maven-version}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
+          mvn-settings: '{mvn-settings}'
+          pom:
 
       - maven-target:
           maven-version: '{maven-version}'
 
       - inject:
           properties-file: version.properties
-      - maven-target:
+      - maven-set-release-version:
           maven-version: '{maven-version}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
+          mvn-settings: '{mvn-settings}'
+          pom:
 
       - maven-target:
           maven-version: '{maven-version}'
 
       - inject:
           properties-file: version.properties
-      - maven-target:
+      - maven-set-release-version:
           maven-version: '{maven-version}'
+          mvn-settings: '{mvn-settings}'
           pom: '{pom}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
 
       - maven-target:
           maven-version: '{maven-version}'
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
-- job-template:
-    # Job template for Java daily release jobs with POM not at the root
+
+- job-template: &merge_java_defaults
+    # Job template for Java merge jobs
     #
     # The purpose of this job template is to run:
-    # 1. maven set versions
-    # 2. maven clean deploy with Sonar scans
-    #
-    # This job supports subprojects.
+    # 1. maven clean deploy
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
-    #     pom:       name/location of the pom.xml file relative to the workspace
 
-    name: '{project-name}-{stream}-{subproject}-release-version-java-shell-daily'
+    name: '{project-name}-{stream}-merge-java'
 
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
-    maven-deploy-properties:
+    pattern: '**'
+    pom:
+    mvn_properties: []
+    mvn-params: ''
+
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
           build-timeout: '{build-timeout}'
 
     triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
-      - gerrit-trigger-release-manually:
+      - gerrit-trigger-patch-merged:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
+          files: '{pattern}'
 
     builders:
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-
-      - inject:
-          properties-file: version.properties
       - maven-target:
           maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
+          pom: '{obj:pom}'
+          goals: 'clean deploy -B {mvn-params}
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-
-      - shell: '{script}'
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java merge jobs
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean deploy
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-merge-java'
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    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: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java merge jobs based on
-    #   '{project-name}-{stream}-merge-java'
-    # The purpose of this job template is to run:
-    # 1. maven clean deploy
-    #
-    # This project supports maven properties.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    #     maven-properties: properties passed to maven
-
-    name: '{project-name}-{stream}-merge-properties-java'
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    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: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-          properties: '{obj:mvn_properties}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java merge jobs that takes a maven template
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean deploy -P {mvn-profile}
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-merge-profile-java'
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    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: '{files}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - docker-login
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy -P {mvn-profile} -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-          properties:
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java merge jobs that should also be triggered by upstream
-    # merges
-    #
-    # Required Variables:
-    #   stream:         release stream
-    #   branch:         git branch
-    #   dependencies:   fully qualified upstream job name to trigger on
-    #                   this may be ''
-
-    name: '{project-name}-{stream}-downstream-merge-java'
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - reverse:
-          jobs: '{dependencies}'
-          result: 'success'
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java merge jobs with POM not at the root
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean deploy
-    #
-    # This job supports subprojects.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    #     pom:       name/location of the pom.xml file relative to the workspace
-    #     pattern:   ant file-path pattern relative to the workspace used to
-    #                trigger the job
-
-    name: '{project-name}-{stream}-{subproject}-merge-java'
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    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:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Docker daily jobs
-    #
-    # The purpose of this job template is to run:
-    # 1. login to the docker registry
-    # 2. docker push
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-docker-java-daily'
-    id: '{project-name}-{stream}-docker-java-daily'
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-      - maven-params:
-          mvn-params: '{mvn-params}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - docker-login
-
-      - maven-docker-push-daily:
-          maven-version: '{maven-version}'
-          mvn-settings: '{mvn-settings}'
-          pom: '{docker-pom}'
-          # use default as mvn-profile if profile is not needed
-          mvn-profile: '{mvn-profile}'
-          mvn-params: '{mvn-params}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Docker daily jobs
-    #
-    # The purpose of this job template is to run:
-    # 1. login to the docker registry
-    # 2. docker push
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-docker-java-daily'
-    id: docker-java-daily
-    project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-      - maven-params:
-          mvn-params: '{mvn-params}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers-docker-build:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - docker-login
-
-      - maven-docker-push-daily:
-          maven-version: '{maven-version}'
-          mvn-settings: '{mvn-settings}'
-          pom: '{docker-pom}'
-          # use default as mvn-profile if profile is not needed
-          mvn-profile: '{mvn-profile}'
-          mvn-params: '{mvn-params}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-
-- job-template:
-    # Job template for building & pushing docker images
-    #
-    # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. maven clean deploy on the specified profile
-    #
-    # This job uses a conditional regex match step to set versions.
-    # This template supports maven properties.
-    #
-    # Required Variables:
-    #     pom:       name/location of the pom.xml file relative to the workspace
-    #     profile:   the docker profile defined in the pom
-    #     maven-properties: properties passed to maven
-
-    name: '{project-name}-{stream}-docker-java-properties-daily'
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-      - maven-params:
-          mvn-params: '{mvn-params}'
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - conditional-step:
-          condition-kind: regex-match
-          regex: DoSetVersion
-          label: '{setVersion}'
-          steps:
-            - inject:
-                properties-file: version.properties
-            - maven-target:
-                maven-version: '{maven-version}'
-                goals: 'versions:set versions:update-child-modules versions:commit -B'
-                properties:
-                  - 'newVersion=${{release_version}}'
-                settings: '{mvn-settings}'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
-      - docker-login
-      - maven-docker-push-daily:
-          maven-version: '{maven-version}'
-          mvn-settings: '{mvn-settings}'
-          pom: '{docker-pom}'
-          properties: '{maven-properties}'
-          # use default as mvn-profile if profile is not needed
-          mvn-profile: '{mvn-profile}'
-          mvn-params: '{mvn-params}'
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for building & pushing docker images
-    #
-    # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. run a specified shell builder
-    #
-    # Required Variables:
-    #     pom:       name/location of the pom.xml file relative to the workspace
-    #     maven-properties: properties passed to maven
-
-    name: '{project-name}-{stream}-docker-java-shell-daily'
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - docker-login
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for building & pushing docker images
-    #
-    # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. inject a version.properties file and set versions
-    #  3. run a specified shell builder
-    #
-    # Required Variables:
-    #     pom:       name/location of the pom.xml file relative to the workspace
-    #     maven-properties: properties passed to maven
-
-    name: '{project-name}-{stream}-docker-java-version-shell-daily'
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - inject:
-          properties-file: version.properties
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - docker-login
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for building & pushing docker images
-    #
-    # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. inject a version.properties file and set versions
-    #  3. run a specified shell builder
-    #
-    # This template supports subprojects.
-    #
-    # Required Variables:
-    #     pom:       name/location of the pom.xml file relative to the workspace
-    #     maven-properties: properties passed to maven
-
-    name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - inject:
-          properties-file: version.properties
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - docker-login
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - shell: '{script}'
+          properties: '{obj:mvn_properties}'
 
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for building & pushing docker images
-    #
+    # Job template for Java merge jobs based on
+    #   '{project-name}-{stream}-merge-java'
     # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. inject a version.properties file and set versions
-    #  3. run a docker push
+    # 1. maven clean deploy
+    #
+    # This project supports maven properties.
     #
     # Required Variables:
-    #     pom:       name/location of the pom.xml file relative to the workspace
-    #     profile:   the docker profile defined in the pom
+    #     branch:    git branch (eg. stable/lithium or master)
     #     maven-properties: properties passed to maven
 
-    name: '{project-name}-{stream}-docker-version-java-daily'
-    id: '{project-name}-{stream}-docker-version-java-daily'
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-      - maven-params:
-          mvn-params: '{mvn-params}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - inject:
-          properties-file: version.properties
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - docker-login
-
-      - maven-docker-push-daily:
-          maven-version: '{maven-version}'
-          mvn-settings: '{mvn-settings}'
-          pom: '{docker-pom}'
-          # use default as mvn-profile if profile is not needed
-          mvn-profile: '{mvn-profile}'
-          mvn-params: '{mvn-params}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+    <<: *merge_java_defaults
+    name: '{project-name}-{stream}-merge-properties-java'
 
 - job-template:
-    # Job template for building & pushing docker images
+    # Job template for Java merge jobs that takes a maven template
     #
     # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. inject a version.properties file and set versions
-    #  3. run a docker push
+    # 1. maven clean deploy -P {mvn-profile}
     #
     # Required Variables:
-    #     pom:       name/location of the pom.xml file relative to the workspace
-    #     profile:   the docker profile defined in the pom
-    #     maven-properties: properties passed to maven
-
-    name: '{project-name}-{stream}-docker-version-java-daily'
-    id: 'docker-version-java-daily'
-    project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-      - maven-params:
-          mvn-params: '{mvn-params}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers-docker-build:
-          build-timeout: '{build-timeout}'
+    #     branch:    git branch (eg. stable/lithium or master)
 
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
+    <<: *merge_java_defaults
+    name: '{project-name}-{stream}-merge-profile-java'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
-      - inject:
-          properties-file: version.properties
+      - docker-login
 
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
+          goals: 'clean deploy -P {mvn-profile} -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-
-      - docker-login
-
-      - maven-docker-push-daily:
-          maven-version: '{maven-version}'
-          mvn-settings: '{mvn-settings}'
-          pom: '{docker-pom}'
-          # use default as mvn-profile if profile is not needed
-          mvn-profile: '{mvn-profile}'
-          mvn-params: '{mvn-params}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+          properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
 
 - job-template:
-    # Job template for building & pushing docker images
+    # Job template for Java merge jobs with POM not at the root
     #
     # The purpose of this job template is to run:
-    #  1. inject a version.properties file and set versions
-    #  2. login to the docker registry
-    #  3. run a docker push
+    # 1. maven clean deploy
     #
     # This job supports subprojects.
     #
     # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
     #     pom:       name/location of the pom.xml file relative to the workspace
-    #     maven-properties: properties passed to maven
+    #     pattern:   ant file-path pattern relative to the workspace used to
+    #                trigger the job
+
+    <<: *merge_java_defaults
+    name: '{project-name}-{stream}-{subproject}-merge-java'
+
+- job-template: &docker_java_defaults
+    # Job template for Docker daily jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. login to the docker registry
+    # 2. docker push
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
 
-    name: '{project-name}-{stream}-{subproject}-docker-version-java-daily'
+    name: '{project-name}-{stream}-docker-java-daily'
+    id: '{project-name}-{stream}-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
     disabled: '{disabled}'
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
-      - inject:
-          properties-file: version.properties
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
       - docker-login
 
       - maven-docker-push-daily:
           maven-version: '{maven-version}'
-          pom: '{pom}'
           mvn-settings: '{mvn-settings}'
           pom: '{docker-pom}'
           # use default as mvn-profile if profile is not needed
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for building & pushing docker images for AAI specific repos
+    # Job template for Docker daily jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. login to the docker registry
+    # 2. docker push
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *docker_java_defaults
+    name: '{project-name}-{stream}-docker-java-daily'
+    id: docker-java-daily
+    node: '{build-node}'
+    wrappers:
+      - infra-wrappers-docker-build:
+          build-timeout: '{build-timeout}'
+
+- job-template:
+    # Job template for building & pushing docker images
     #
     # The purpose of this job template is to run:
     #  1. login to the docker registry
-    #  2. run maven goals
-    #  3. run include-docker-push.sh
+    #  2. maven clean deploy on the specified profile
+    #
+    # This job uses a conditional regex match step to set versions.
+    # This template supports maven properties.
     #
     # Required Variables:
     #     pom:       name/location of the pom.xml file relative to the workspace
+    #     profile:   the docker profile defined in the pom
     #     maven-properties: properties passed to maven
 
-    name: '{project-name}-{stream}-aai-docker-java-daily'
+    name: '{project-name}-{stream}-docker-java-properties-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    docker-image-name: ''
     disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
-
     parameters:
       - infra-parameters:
           project: '{project}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
-      - docker-image-name:
-          docker-image-name: '{docker-image-name}'
-
+      - maven-params:
+          mvn-params: '{mvn-params}'
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
           submodule-recursive: '{submodule-recursive}'
-
     wrappers:
       - infra-wrappers:
           build-timeout: '{build-timeout}'
-
     triggers:
       # 12 AM UTC
       - timed: 'H 12 * * *'
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-
+      - conditional-step:
+          condition-kind: regex-match
+          regex: DoSetVersion
+          label: '{setVersion}'
+          steps:
+            - inject:
+                properties-file: version.properties
+            - maven-set-release-version:
+                maven-version: '{maven-version}'
+                mvn-settings: '{mvn-settings}'
+                pom:
       - docker-login
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: 'pom.xml'
-          goals: 'clean install -DskipTests -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - maven-target:
+      - maven-docker-push-daily:
           maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-          properties:
-            - maven.test.skip=true
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
-
-      - shell: !include-raw-escape: include-docker-push.sh
-
+          mvn-settings: '{mvn-settings}'
+          pom: '{docker-pom}'
+          properties: '{maven-properties}'
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: '{mvn-profile}'
+          mvn-params: '{mvn-params}'
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for building & pushing docker images for AAI specific repos
+    # Job template for building & pushing docker images
     #
     # The purpose of this job template is to run:
     #  1. login to the docker registry
-    #  2. run maven goals
-    #  3. run include-docker-push.sh
-    #
-    # This job supports subprojects
+    #  2. run a specified shell builder
     #
     # Required Variables:
     #     pom:       name/location of the pom.xml file relative to the workspace
     #     maven-properties: properties passed to maven
 
-    name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily'
+    name: '{project-name}-{stream}-docker-java-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     disabled: '{disabled}'
-    docker-image-name: ''
-
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
-      - docker-image-name:
-          docker-image-name: '{docker-image-name}'
 
     scm:
       - gerrit-trigger-scm:
 
       - maven-target:
           maven-version: '{maven-version}'
-          pom: 'pom.xml'
-          goals: 'clean install -DskipTests -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-          properties:
-            - maven.test.skip=true
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
 
-      - shell: !include-raw-escape: include-docker-push.sh
+      - shell: '{script}'
 
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for Java daily release jobs
+    # Job template for building & pushing docker images
     #
     # The purpose of this job template is to run:
-    # 1. inject a version.properties file and set versions
-    # 2. change version in all POM files to the release version specified
-    #    in version.properties. This is done using a script instread of
-    #    the mvn version plugin that assumes some specific parent structure
-    #
-    # The POM files are required to use the Maven staging plugin so the deploy
-    # does not deploy directly to the release repo.
+    #  1. login to the docker registry
+    #  2. run a specified shell builder
     #
     # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-release-version2-java-daily'
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
 
+    name: '{project-name}-{stream}-{subproject}-docker-java-shell-daily'
     project-type: freestyle
     node: '{build-node}'
     disabled: '{disabled}'
-    maven-deploy-properties:
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
           build-timeout: '{build-timeout}'
 
     triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
 
     builders:
+
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-      - maven-install:
-          maven-version: '{maven-version}'
 
-      - inject:
-          properties-file: version.properties
-
-      - shell: !include-raw-escape: include-update-pom-versions.sh
+      - docker-login
 
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy site:site site:stage-deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
+          pom: '{pom}'
+          goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
 
+      - shell: '{script}'
+
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for Java daily release jobs
+    # Job template for building & pushing docker images
     #
     # The purpose of this job template is to run:
-    # 1. inject a version.properties file and set versions
-    # 2. change version in all POM files to the release version specified
-    #     in version.properties. This is done using a script instread of
-    #     the mvn version plugin that assumes some specific parent structure
-    #
-    # The POM files are required to use the Maven staging plugin so the deploy
-    # does not deploy directly to the release repo.
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a specified shell builder
     #
     # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
     #     pom:       name/location of the pom.xml file relative to the workspace
-    #     pattern:   ant file-path pattern relative to the workspace used to
-    #                trigger the job
-
-    name: '{project-name}-{stream}-{subproject}-release-version2-java-daily'
+    #     maven-properties: properties passed to maven
 
+    name: '{project-name}-{stream}-docker-java-version-shell-daily'
     project-type: freestyle
-    node: '{build-node}'
+    node: 'ubuntu1604-docker-8c-8g'
     disabled: '{disabled}'
-    maven-deploy-properties:
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
           build-timeout: '{build-timeout}'
 
     triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '{pattern}'
 
     builders:
+
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-      - maven-install:
-          maven-version: '{maven-version}'
 
       - inject:
           properties-file: version.properties
+      - maven-set-release-version:
+          maven-version: '{maven-version}'
+          mvn-settings: '{mvn-settings}'
+          pom:
 
-      - shell: !include-raw-escape: include-update-pom-versions.sh
+      - docker-login
 
       - maven-target:
           maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy site:site site:stage-deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
+          goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
 
+      - shell: '{script}'
+
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for Java daily release jobs
+    # Job template for building & pushing docker images
     #
     # The purpose of this job template is to run:
-    #  1. inject a version.properties file and set versions
-    #  2. change version in all POM files to the release version specified
-    #     in version.properties. This is done using a script instread of
-    #     the mvn version plugin that assumes some specific parent structure
-    #     This version does NOT change the version within the <parent> tag
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a specified shell builder
     #
-    # The POM files are required to use the Maven staging plugin so the deploy
-    # does not deploy directly to the release repo.
+    # This template supports subprojects.
     #
     # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
     #     pom:       name/location of the pom.xml file relative to the workspace
-    #     pattern:   ant file-path pattern relative to the workspace used to
-    #                trigger the job
-
-    name: '{project-name}-{stream}-{subproject}-release-version3-java-daily'
+    #     maven-properties: properties passed to maven
 
+    name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
-    node: '{build-node}'
+    node: 'ubuntu1604-docker-8c-8g'
     disabled: '{disabled}'
-    maven-deploy-properties:
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
           build-timeout: '{build-timeout}'
 
     triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '{pattern}'
 
     builders:
+
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-      - maven-install:
-          maven-version: '{maven-version}'
 
       - inject:
           properties-file: version.properties
+      - maven-set-release-version:
+          maven-version: '{maven-version}'
+          mvn-settings: '{mvn-settings}'
+          pom: '{pom}'
 
-      - shell: !include-raw-escape: include-update-pom-versions-not-parent.sh
+      - docker-login
 
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy site:site site:stage-deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
+          goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
 
+      - shell: '{script}'
+
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
-- job-template:
-    # Job template for Java merge jobs for SDC specific repos
+- job-template: &docker_version_java_defaults
+    # Job template for building & pushing docker images
     #
     # The purpose of this job template is to run:
-    # 1. maven clean deploy
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a docker push
     #
     # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-sdc-merge-java'
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     profile:   the docker profile defined in the pom
+    #     maven-properties: properties passed to maven
 
+    name: '{project-name}-{stream}-docker-version-java-daily'
+    id: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    build-timeout: 120
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
 
     scm:
       - gerrit-trigger-scm:
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit-trigger-patch-merged:
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
+      - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '**'
 
     builders:
+
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
+      - inject:
+          properties-file: version.properties
+      - maven-set-release-version:
+          maven-version: '{maven-version}'
+          mvn-settings: '{mvn-settings}'
+          pom:
+
       - docker-login
 
-      - maven-docker-push-daily-test:
+      - maven-docker-push-daily:
           maven-version: '{maven-version}'
           mvn-settings: '{mvn-settings}'
           pom: '{docker-pom}'
           # use default as mvn-profile if profile is not needed
           mvn-profile: '{mvn-profile}'
+          mvn-params: '{mvn-params}'
 
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+- job-template:
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a docker push
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     profile:   the docker profile defined in the pom
+    #     maven-properties: properties passed to maven
+
+    <<: *docker_version_java_defaults
+    name: '{project-name}-{stream}-docker-version-java-daily'
+    id: 'docker-version-java-daily'
+    node: '{build-node}'
+    wrappers:
+      - infra-wrappers-docker-build:
+          build-timeout: '{build-timeout}'
+
 - job-template:
     # Job template for building & pushing docker images for AAI specific repos
     #
     # The purpose of this job template is to run:
     #  1. login to the docker registry
-    #  2. run maven clean install goals skipping tests
-    #  3. run maven goals
+    #  2. run maven goals
+    #  3. run include-docker-push.sh
     #
     # Required Variables:
     #     pom:       name/location of the pom.xml file relative to the workspace
     #     maven-properties: properties passed to maven
 
-    name: '{project-name}-{stream}-aai-docker-java-version-daily'
+    name: '{project-name}-{stream}-aai-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
+    docker-image-name: ''
     disabled: '{disabled}'
     properties:
       - infra-properties:
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
+      - docker-image-name:
+          docker-image-name: '{docker-image-name}'
 
     scm:
       - gerrit-trigger-scm:
       - maven-target:
           maven-version: '{maven-version}'
           pom: 'pom.xml'
-          goals: 'clean install -DskipTests -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+          goals: 'clean install -DskipTests -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
 
+      - shell: !include-raw-escape: include-docker-push.sh
+
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+- job-template:
+    # Job template for Java merge jobs for SDC specific repos
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *merge_java_defaults
+    name: '{project-name}-{stream}-sdc-merge-java'
+
+    node: 'ubuntu1604-docker-8c-8g'
+    build-timeout: 120
+
+    builders:
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+      - docker-login
+
+      - maven-docker-push-daily:
+          maven-version: '{maven-version}'
+          mvn-settings: '{mvn-settings}'
+          pom: '{docker-pom}'
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: '{mvn-profile}'
+          mvn-params: ''
index b03bce3..80ae84b 100644 (file)
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
-- job-template:
-    # Job template for docker daily jobs for 2 SCMs
-    #
-    # The purpose of this job template is to run:
-    # 1. inject a version properties file
-    # 2. login into the docker registry
-    # 4. run a specified shell script
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-2scm-docker-shell-daily'
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-      - git-extra-project:
-          project: '{extra-project1}'
-          refspec: '{extra-refspec1}'
-          branch: '{extra-branch1}'
-          checkout-dir: '{checkout-dir1}'
-      - git-extra-project:
-          project: '{extra-project2}'
-          refspec: '{extra-refspec2}'
-          branch: '{extra-branch2}'
-          checkout-dir: '{checkout-dir2}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - inject:
-          properties-file: version.properties
-      - docker-login
-      - shell: '{script}'
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for docker daily jobs for 3 SCMs
index 991ffd6..9264bc9 100644 (file)
 ---
 # vim: sw=2 ts=2 sts=2 et :
 
-
-- job-template:
-    # Job template for verifying a submission.  triggered on
-    # gerrit-trigger-patch-submitted, does scm, mvn with passed in goals,
-    # then run script
-    #
-    # Required Variables:
-    #   branch:         git branch
-    #   script:         build script to execute
-    #   mvn-settings:   settings file for this specific job
-    #   mvn-goals:      space separated list of maven build goals (e.g.
-    #                   clean, install etc, --version for noop)
-    name: '{project-name}-{stream}-verify-scm-mvn-script'
-
-    project-type: freestyle
-    concurrent: true
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - docker-login
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for merging a submission.  triggered on
-    # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then
-    # run script
-    # Required Variables:
-    #   branch:         git branch
-    #   script:         build script to execute
-    #   mvn-settings:   settings file for this specific job
-    #   mvn-goals:      space separated list of maven build goals (--version
-    #                   for noop, clean deploy for deploy [snapshot])
-    name: '{project-name}-{stream}-merge-scm-mvn-script'
-
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    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: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - docker-login
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for daily-release a submission.  triggered on timer, does
-    # scm mvn with passed-in goals, then run script
-    #
-    # Required Variables:
-    #   branch:         git branch
-    #   script:         build script to execute
-    #   mvn-goals-versioning: space separated list of maven build goals
-    #      (--version for no op,
-    #      or versions:set versions:update-child-modules versions:commit)
-    #   mvn-goals: space separated list of maven build goals (--version for
-    #      noop, or clean deploy)
-    name: '{project-name}-{stream}-daily-release-scm-mvn-script'
-
-    project-type: freestyle
-    concurrent: true
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - inject:
-          properties-file: version.properties
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals-versioning}'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - docker-login
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for daily-release a submission.  triggered on timer, does
-    # scm mvn with passed-in goals, then run script.
-    # Version changed using include-update-pom-versions.sh script
-    #
-    # Required Variables:
-    #   branch:         git branch
-    #   script:         build script to execute
-    #   mvn-goals: space separated list of maven build goals (--version for
-    #      noop, or clean deploy)
-    name: '{project-name}-{stream}-daily-release-version2-scm-mvn-script'
-
-    project-type: freestyle
-    concurrent: true
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - inject:
-          properties-file: version.properties
-
-      - shell: !include-raw-escape: include-update-pom-versions.sh
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - docker-login
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for verifying a submission.  triggered on
-    # gerrit-trigger-patch-submitted,
-    # does scm 2 repos, mvn with passed-in goals, then run script
-    #
-    # Required Variables:
-    #   branch:         git branch
-    #   script:         build script to execute
-    #   extra-project:  extra gerrit project to checkout
-    #   extra-refspec:  refspec for the extra project
-    #   extra-branch:   branch to checkout for the extra project
-    #   checkout-dir:   directory to checkout the extra project to
-    #                     DO NOT SET THIS TO anything that translates to
-    #                     $WORKSPACE as it will destroy the initial
-    #                     project checkout
-    #   mvn-goals:      space separated list of maven build goals (e.g.
-    #                   clean, install etc,  --version for noop)
-
-    name: '{project-name}-{stream}-verify-2scm-mvn-script'
-
-    project-type: freestyle
-    concurrent: true
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-      - git-extra-project:
-          project: '{extra-project}'
-          refspec: '{extra-refspec}'
-          branch: '{extra-branch}'
-          checkout-dir: '{checkout-dir}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - docker-login
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
 - job-template:
-    # Job template for merged submission.  triggered on
-    # gerrit-trigger-patch-merged,does scm of 2 repos, mvn with passed in
-    # goals, then run script
-    #
+    # Job template for merging a submission.  triggered on
+    # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then
+    # run script
     # Required Variables:
     #   branch:         git branch
     #   script:         build script to execute
-    #   extra-project:  extra gerrit project to checkout
-    #   extra-refspec:  refspec for the extra project
-    #   extra-branch:   branch to checkout for the extra project
-    #   checkout-dir:   directory to checkout the extra project to
-    #                     DO NOT SET THIS TO anything that translates to
-    #                     $WORKSPACE as it will destroy the initial
-    #                     project checkout
+    #   mvn-settings:   settings file for this specific job
     #   mvn-goals:      space separated list of maven build goals (--version
-    #                   for noop, clean deploy for mvn project)
-
-    name: '{project-name}-{stream}-merge-2scm-mvn-script'
+    #                   for noop, clean deploy for deploy [snapshot])
+    name: '{project-name}-{stream}-merge-scm-mvn-script'
 
     project-type: freestyle
-    concurrent: true
     node: 'ubuntu1604-docker-8c-8g'
 
     properties:
           refspec: ''
           choosing-strategy: 'default'
           submodule-recursive: '{submodule-recursive}'
-      - git-extra-project:
-          project: '{extra-project}'
-          refspec: '{extra-refspec}'
-          branch: '{extra-branch}'
-          checkout-dir: '{checkout-dir}'
 
     wrappers:
       - infra-wrappers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
-- job-template:
-    # Job template for merged submission.  triggered on
-    # gerrit-trigger-patch-merged, does scm x2, mvn with passed-in goals,
-    # then run script
-    #
-    # Required Variables:
-    #   branch:         git branch
-    #   script:         build script to execute
-    #   extra-project:  extra gerrit project to checkout
-    #   extra-refspec:  refspec for the extra project
-    #   extra-branch:   branch to checkout for the extra project
-    #   checkout-dir:   directory to checkout the extra project to
-    #                     DO NOT SET THIS TO anything that translates to
-    #                     $WORKSPACE as it will destroy the initial
-    #                     project checkout
-    #   mvn-goals:      space separated list of maven build goals (--version
-    #                   for noop, clean deploy for mvn project)
-    #   mvn-goals-versioning:      space separated list of maven build goals
-    #                   (--version for no op, clean deploy for mvn project)
-
-    name: '{project-name}-{stream}-daily-release-2scm-mvn-script'
-
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-      - git-extra-project:
-          project: '{extra-project}'
-          refspec: '{extra-refspec}'
-          branch: '{extra-branch}'
-          checkout-dir: '{checkout-dir}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - timed: 'H 11 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - inject:
-          properties-file: version.properties
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals-versioning}'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - docker-login
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for basic scm and script trigger
-    #
-    # Required Variables:
-    #   branch:         git branch
-    #   build-node:     what build node to run on
-    #   script:         build script to execute
-
-    name: '{project-name}-{stream}-verify-script'
-
-    project-type: freestyle
-    concurrent: true
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      # make sure maven gets installed / setup
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '--version'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for 2 scm and script trigger
           maven-version: '{maven-version}'
 
 
-- job-template:
-    # Job template for 3 scm and script trigger
-    #
-    # Required Variables:
-    #   branch:         git branch
-    #   build-node:     what build node to run on
-    #   script:         build script to execute
-    #   extra-project1:  extra gerrit project to checkout
-    #   extra-refspec1:  refspec for the extra project
-    #   extra-branch1:   branch to checkout for the extra project
-    #   checkout-dir1:   directory to checkout the extra project to
-    #                     DO NOT SET THIS TO anything that translates to
-    #                     $WORKSPACE as it will destroy the initial
-    #                     project checkout
-    #   extra-project2:  extra gerrit project to checkout
-    #   extra-refspec2:  refspec for the extra project
-    #   extra-branch2:   branch to checkout for the extra project
-    #   checkout-dir2:   directory to checkout the extra project to
-    #                     DO NOT SET THIS TO anything that translates to
-    #                     $WORKSPACE as it will destroy the initial
-    #                     project checkout
-    name: '{project-name}-{stream}-three-scm-verify-script'
-
-    project-type: freestyle
-    concurrent: true
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-      - git-extra-project:
-          project: '{extra-project1}'
-          refspec: '{extra-refspec1}'
-          branch: '{extra-branch1}'
-          checkout-dir: '{checkout-dir1}'
-      - git-extra-project:
-          project: '{extra-project2}'
-          refspec: '{extra-refspec2}'
-          branch: '{extra-branch2}'
-          checkout-dir: '{checkout-dir2}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      # make sure maven gets installed / setup
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '--version'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
 
 # vim: sw=2 ts=2 sts=2 et :
 
index 8463468..3992f04 100644 (file)
@@ -3,7 +3,7 @@
     name: holmes-common
     project-name: 'holmes-common'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index aad09f2..6a559ef 100644 (file)
@@ -3,7 +3,7 @@
     name: holmes-dsa
     project-name: 'holmes-dsa'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 12f31ab..22cd81b 100644 (file)
@@ -3,7 +3,7 @@
     name: holmes-engine-management
     project-name: 'holmes-engine-management'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 9edc33e..3d88fba 100644 (file)
@@ -3,7 +3,7 @@
     name: holmes-rule-management
     project-name: 'holmes-rule-management'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml
deleted file mode 100644 (file)
index fac83ca..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: integration-seccom
-    project-name: 'integration-seccom'
-    jobs:
-      - gerrit-maven-clm
-    project: 'integration/seccom'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-seccom-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
index 15f2074..a01e82f 100644 (file)
@@ -31,8 +31,6 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
       - gerrit-trigger-patch-merged:
           server: '{server-name}'
           project: '{project}'
index 6c700fb..e97f0ab 100644 (file)
@@ -3,7 +3,8 @@
     name: integration
     project-name: 'integration'
     jobs:
-      - gerrit-maven-clm
+      - gerrit-maven-clm:
+          mvn-params: '-f version-manifest/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
index 5f46494..ff7a59d 100644 (file)
@@ -31,6 +31,6 @@
 
     publishers:
       - integration-robot:
-          unstable-if: 75.0
+          unstable-if: 60.0
           pass-if: 100.0
       - lf-infra-publish
index d2a10f8..756aa95 100644 (file)
@@ -7,6 +7,10 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
     project: logging-analytics/pomba/pomba-aai-context-builder
     stream:
       - 'master':
@@ -15,6 +19,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+    maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-aai-context-builder-sonar
@@ -27,6 +32,7 @@
     branch: master
     mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-aai-context-builder-info
index 534c995..74ee554 100644 (file)
@@ -7,6 +7,11 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'docker:build'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
     project: logging-analytics/pomba/pomba-context-aggregator
     stream:
       - 'master':
@@ -15,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+    maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-context-aggregator-sonar
@@ -27,6 +33,7 @@
     branch: master
     mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-context-aggregator-info
index 0b87b8f..e163816 100644 (file)
@@ -7,6 +7,10 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
     project: logging-analytics/pomba/pomba-network-discovery-context-builder
     stream:
       - 'master':
@@ -15,6 +19,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+    maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-network-discovery-context-builder-sonar
@@ -27,6 +32,7 @@
     branch: master
     mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-network-discovery-context-builder-info
index f9822f2..83c002a 100644 (file)
@@ -7,6 +7,10 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
     project: logging-analytics/pomba/pomba-sdc-context-builder
     stream:
       - 'master':
@@ -15,6 +19,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+    maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-sdc-context-builder-sonar
@@ -27,6 +32,7 @@
     branch: master
     mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-sdc-context-builder-info
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
deleted file mode 100644 (file)
index b0eab1f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
-    jobs:
-      - gerrit-maven-clm
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    project: 'logging-analytics/pomba/pomba-sdnc-context-builder'
-    branch: 'master'
index bf041e2..c7da967 100644 (file)
@@ -3,7 +3,7 @@
     name: logging-analytics
     project-name: 'logging-analytics'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 55d66d4..5c9335f 100644 (file)
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'APIs':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-version-java-daily'
+          trigger_jobs: '{project-name}-{stream}-release-version-java-daily'
     robot-options: ''
     branch: 'master'
index 21d63d7..f1cce6d 100644 (file)
@@ -3,7 +3,7 @@
     name: msb-apigateway
     project-name: 'msb-apigateway'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 9dada47..3b4df5f 100644 (file)
@@ -8,16 +8,12 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
       - 'rest-service':
-          trigger_jobs:
-            - 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
       - 'tcp-service':
-          trigger_jobs:
-            - 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
       - 'iag-redirect-discovery':
-          trigger_jobs:
-            - 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index 1183592..5e197b1 100644 (file)
@@ -3,7 +3,7 @@
     name: msb-discovery
     project-name: 'msb-discovery'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 4e41919..19e1eff 100644 (file)
@@ -3,7 +3,7 @@
     name: msb-java-sdk
     project-name: 'msb-java-sdk'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index c7eb47c..d892a86 100644 (file)
@@ -3,7 +3,7 @@
     name: msb-swagger-sdk
     project-name: 'msb-swagger-sdk'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/multicloud/build-multicloud-azure-docker-image.sh b/jjb/multicloud/build-multicloud-azure-docker-image.sh
new file mode 100644 (file)
index 0000000..e4e6d8d
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./azure/docker/*.*
+
+./azure/docker/build_image.sh
+
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
new file mode 100644 (file)
index 0000000..39179fa
--- /dev/null
@@ -0,0 +1,41 @@
+---
+- project:
+    name: multicloud-azure-java
+    project-name: 'multicloud-azure'
+    project: 'multicloud/azure'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-azure-settings'
+    subproject:
+      - 'azure':
+          pom: 'azure/pom.xml'
+          pattern: 'azure/**'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: multicloud-azure-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'multicloud/azure'
+    project-name: 'multicloud-azure'
+    branch: 'master'
+    mvn-settings: 'multicloud-azure-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml
new file mode 100644 (file)
index 0000000..5066a4c
--- /dev/null
@@ -0,0 +1,16 @@
+---
+- project:
+    name: multicloud-azure-python
+    project-name: 'multicloud-azure'
+    project: 'multicloud/azure'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-azure-settings'
+    build-node: 'ubuntu1604-builder-4c-4g'
+    subproject:
+      - 'azure':
+          path: 'azure'
+          pattern: 'azure/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
index 770df54..1687e9c 100644 (file)
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - '{project-name}-{stream}-multivimbroker-merge-java'
+          trigger_jobs: '{project-name}-{stream}-multivimbroker-merge-java'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
new file mode 100644 (file)
index 0000000..94595ed
--- /dev/null
@@ -0,0 +1,21 @@
+---
+- project:
+    name: multicloud-k8s
+    project-name: 'multicloud-k8s'
+    path: 'src/k8splugin'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-verify-golang'
+      - '{project-name}-{stream}-merge-golang'
+    project: 'multicloud/k8s'
+    subproject:
+      - validation-scripts:
+          path: '.'
+          pattern: '**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-k8s-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
index e60ab63..404577d 100644 (file)
@@ -8,10 +8,8 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
       - 'hpa-discovery':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index ce036f1..f61f66d 100644 (file)
@@ -4,14 +4,10 @@
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-openstack-pike'
+    project-name: 'multicloud-pike'
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
-      - 'hpa-discovery':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index a0ea6a6..6d1fc12 100644 (file)
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-vmware-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index 34ee201..fa8dfd4 100644 (file)
@@ -7,7 +7,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index 7172e7a..a0dbc81 100644 (file)
@@ -8,8 +8,7 @@
      stream: 'master'
      functionality:
        - 'music-test-plan':
-           trigger_jobs:
-             - 'music-master-docker-version-java-daily'
+           trigger_jobs: 'music-master-docker-version-java-daily'
      robot-options: ''
      branch: 'master'
 
index 14a64ca..ca94fcd 100644 (file)
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'music-distributed-kv-store-test-plan':
-          trigger_jobs:
-            - 'music-distributed-kv-store-master-docker-golang-shell-daily'
+          trigger_jobs: 'music-distributed-kv-store-master-docker-golang-shell-daily'
     robot-options: ''
     branch: 'master'
index f853083..69fa0c4 100644 (file)
@@ -4,7 +4,6 @@
     project-name: 'music-distributed-kv-store'
     path: 'src/dkv'
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
       - '{project-name}-{stream}-docker-golang-shell-daily':
index 9b88d13..3e2031a 100644 (file)
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: music-prom-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'music/prom'
-    project-name: 'music-prom'
-    branch: 'master'
-    mvn-settings: 'music-prom-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml
new file mode 100644 (file)
index 0000000..aa52bec
--- /dev/null
@@ -0,0 +1,22 @@
+---
+- project:
+    name: music-trigger
+    project-name: 'music'
+    subproject:
+      - 'music-trigger':
+          pom: 'musictrigger/pom.xml'
+          pattern: 'musictrigger/**'
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f musictrigger/pom.xml assembly:single'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    project: 'music'
+    stream:
+      - 'trigger-master':
+          branch: 'master'
+    mvn-settings: 'music-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
new file mode 100644 (file)
index 0000000..7b2c7c9
--- /dev/null
@@ -0,0 +1,103 @@
+---
+- project:
+    name: oom
+    project-name: oom
+    project: oom
+    mvn-settings: oom-settings
+    mvn-global-settings: global-settings
+    archive-artifacts: ''
+    build-node: ubuntu1604-helm-2c-1g
+    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
+    oom_build_script: |
+        #!/bin/bash
+        set -e -o pipefail
+        cd kubernetes/
+        make all
+    subproject_build_script: |
+        #!/bin/bash
+        cd kubernetes/
+        make common
+        make {subproject}'
+    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+
+    stream:
+      - 'master':
+          branch: 'master'
+
+    subproject:
+      - 'aaf':
+          files: 'kubernetes/aaf/**'
+      - 'aai':
+          files: 'kubernetes/aai/**'
+      - 'appc':
+          files: 'kubernetes/appc/**'
+      - 'clamp':
+          files: 'kubernetes/clamp/**'
+      - 'cli':
+          files: 'kubernetes/cli/**'
+      - 'common':
+          files: 'kubernetes/common/**'
+      - 'consul':
+          files: 'kubernetes/consul/**'
+      - 'dcaegen2':
+          files: 'kubernetes/dcaegen2/**'
+      - 'dmaap':
+          files: 'kubernetes/dmaap/**'
+      - 'esr':
+          files: 'kubernetes/esr/**'
+      - 'log':
+          files: 'kubernetes/log/**'
+      - 'msb':
+          files: 'kubernetes/msb/**'
+      - 'multicloud':
+          files: 'kubernetes/multicloud/**'
+      - 'nbi':
+          files: 'kubernetes/nbi/**'
+      - 'oof':
+          files: 'kubernetes/oof/**'
+      - 'policy':
+          files: 'kubernetes/policy/**'
+      - 'portal':
+          files: 'kubernetes/portal/**'
+      - 'readiness':
+          files: 'kubernetes/readiness/**'
+      - 'robot':
+          files: 'kubernetes/robot/**'
+      - 'sdc':
+          files: 'kubernetes/sdc/**'
+      - 'sdnc':
+          files: 'kubernetes/sdnc/**'
+      - 'sniro-emulator':
+          files: 'kubernetes/sniro-emulator/**'
+      - 'so':
+          files: 'kubernetes/so/**'
+      - 'uui':
+          files: 'kubernetes/uui/**'
+      - 'vfc':
+          files: 'kubernetes/vfc/**'
+      - 'vid':
+          files: 'kubernetes/vid/**'
+      - 'vnfsdk':
+          files: 'kubernetes/vnfsdk/**'
+
+    jobs:
+      - '{project-name}-{stream}-verify-helm':
+          build_script: '{oom_build_script}'
+          files: '**'
+      - '{project-name}-{stream}-merge-helm':
+          build_script: '{oom_build_script}'
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+          files: '**'
+      - '{project-name}-{stream}-stage-helm':
+          build_script: '{oom_build_script}'
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+          files: '**'
+
+      # Below jobs disabled until future need.
+      - '{project-name}-{subproject}-{stream}-verify-helm':
+          build_script: '{subproject_build_script}'
+      - '{project-name}-{subproject}-{stream}-merge-helm':
+          build_script: '{subproject_build_script}'
+      - '{project-name}-{stream}-update-helm-weekly':
+          build_script: '{oom_build_script}'
+          files: '**'
index 10d574c..ed428f6 100644 (file)
@@ -11,7 +11,6 @@
    submodule-recursive: true
 
    jobs:
-     - gerrit-maven-clm
      - '{project}-{stream}-release-config'
    stream:
      - 'master':
index 3a4c8af..5bd3a06 100755 (executable)
@@ -11,19 +11,37 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+# workaround for https://github.com/pypa/virtualenv/issues/1029
+export PS1=${PS1:-}
+
 # This script creates ArtifactPublishedEvent (APE)
-# The JMS Messaging Plugin doesn't handle the newlines well so the eventBody is
-# constructed on a single line. This is something that needs to be fixed properly
 
-cat << EOF > $WORKSPACE/event.properties
-type=$PUBLISH_EVENT_TYPE
-origin=$PUBLISH_EVENT_ORIGIN
-eventBody="{ 'type': '$PUBLISH_EVENT_TYPE', 'id': '$(uuidgen)', \
-'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$PUBLISH_EVENT_ORIGIN', \
-'buildUrl': '$BUILD_URL', 'branch': 'master', 'artifactLocation': '$ARTIFACT_LOCATION', \
-'confidenceLevel': { $CONFIDENCE_LEVEL } }"
+git clone https://gitlab.openci.io/openci/prototypes.git
+cd prototypes/federated-cicd
+virtualenv openci_publish
+cd openci_publish
+source bin/activate
+python setup.py install
+
+# generate event body
+cat <<EOF > ./json_body.txt
+{
+    "type": "$PUBLISH_EVENT_TYPE",
+    "id": "$(uuidgen)",
+    "time": "$(date -u +%Y-%m-%d_%H:%M:%SUTC)",
+    "buildUrl": "$BUILD_URL",
+    "branch": "master",
+    "origin": "$PUBLISH_EVENT_ORIGIN",
+    "artifactLocation": "$ARTIFACT_LOCATION",
+    "confidenceLevel": "$CONFIDENCE_LEVEL"
+}
 EOF
+
 echo "Constructed $PUBLISH_EVENT_TYPE"
 echo "--------------------------------------------"
-cat $WORKSPACE/event.properties
+cat  ./json_body.txt
 echo "--------------------------------------------"
+
+python openci_publish -H 129.192.69.55 -U ${ACTIVEMQ_USER} -p ${ACTIVEMQ_PASSWORD} -n openci.prototype -B ./json_body.txt
+
+deactivate
index d328e25..b956da7 100644 (file)
           default: "'autorelease': 'SUCCESS'"
           description: 'The confidence level the published artifact gained'
 
+    wrappers:
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: openci-connect-activemq
+              username: ACTIVEMQ_USER
+              password: ACTIVEMQ_PASSWORD
+      - workspace-cleanup
+
     builders:
-      # first build step in the job executes create-ape.sh to construct the
-      # ArtifactPublishedEvent (ape)
+      # this build step in the job executes create-ape.sh to construct the
+      # ArtifactPublishedEvent (ape) and publish it using the python utility
       - shell:
           !include-raw-escape: ./create-ape.sh
-      # constructed event gets injected into environment so JME Messaging
-      # plugin can publish the event and its properties in post-build step
-      - inject:
-          properties-file: "$WORKSPACE/event.properties"
-
-    publishers:
-      - jms-messaging:
-          provider-name: openci.activemq
-          msg-type: Custom
-          msg-props: |
-            type=$type
-            origin=$origin
-          msg-content:
-            $eventBody
 
 # This job gets triggered by a ConfidenceLevelModifiedEvent published
 # by OPNFV jobs so ONAP can promote the autorelease artifact even further.
     triggers:
       - jms-messaging:
           provider-name: openci.activemq
-          selector: CI_TYPE = 'custom'
-          checks:
-            - field: origin
-              expected-value: 'OPNFV'
-            - field: type
-              expected-value: 'ConfidenceLevelModifiedEvent'
-            - field: scenario
-              expected-value: 'k8-nosdn-onap'
+          selector: JMSType = 'ConfidenceLevelModifiedEvent' and JMSOrigin = 'OPNFV' and JMSScenario = 'k8-nosdn-onap-ha'
 
     builders:
       - shell: |
index 459c498..f0d2156 100644 (file)
@@ -12,7 +12,6 @@
            branch: beijing
      functionality:
        - 'has':
-           trigger_jobs:
-             - 'optf-has-master-conductor-docker-java-version-shell-daily'
+           trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily'
      robot-options: ''
      branch: 'master'
index 60e984e..2301524 100644 (file)
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-builder-4c-4g'
+
+- project:
+    name: optf-has-docker
+    project-name: 'optf-has'
+    project: 'optf/has'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
+    mvn-settings: 'optf-has-settings'
+    subproject:
+      - 'conductor':
+          path: 'conductor'
+          pattern: 'conductor/**'
+          pom: 'pom.xml'
+    jobs:
       - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
+          mvn-params: '-Dmaven.test.skip=true'
           script:
             !include-raw-escape: 'build-optf-has-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+          build-node: queue-docker-4c-4g
+      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          mvn-params: '-Dmaven.test.skip=true'
+          script:
+            !include-raw-escape: 'build-optf-has-docker-image.sh'
+          build-node: queue-docker-4c-4g
 
 - project:
     name: optf-has-sonar
index 23d4144..4c98b32 100644 (file)
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-builder-4c-4g'
+
+- project:
+    name: optf-osdf-docker
+    project-name: 'optf-osdf'
+    project: 'optf/osdf'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
+    mvn-settings: 'optf-osdf-settings'
+    subproject:
+      - 'osdf':
+          path: '.'
+          pattern: '**'
+          pom: 'pom.xml'
+    jobs:
       - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
+          mvn-params: '-Dmaven.test.skip=true'
           script:
             !include-raw-escape: 'build-optf-osdf-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+          build-node: queue-docker-4c-4g
+      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          mvn-params: '-Dmaven.test.skip=true'
+          script:
+            !include-raw-escape: 'build-optf-osdf-docker-image.sh'
+          build-node: queue-docker-4c-4g
 
 - project:
     name: optf-osdf-sonar
index 9933ea1..4013563 100644 (file)
@@ -3,7 +3,7 @@
     name: policy-apex-pdp
     project-name: 'policy-apex-pdp'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-scm-mvn-script':
           mvn-goals: 'clean deploy -B
@@ -16,6 +16,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
+          disabled: true
 
     project: 'policy/apex-pdp'
     stream:
index dc487c3..ba3d884 100644 (file)
@@ -3,7 +3,7 @@
     name: policy-common
     project-name: 'policy-common'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
index 5094d2d..89a711d 100644 (file)
@@ -3,7 +3,7 @@
     name: policy-core
     project-name: 'policy-core'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
index b45b5ae..321d3ad 100644 (file)
@@ -1,15 +1,43 @@
 - project:
-    name: policy-csit
+    name: policy-health-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     stream: 'master'
     functionality:
-      - 'health':
-          trigger_jobs:
-            - 'policy-engine-{stream}-merge-scm-mvn-script'
-            - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
-            - 'policy-drools-applications-{stream}-merge-java'
+      - 'health'
+    trigger_jobs:
+      - 'policy-engine-{stream}-merge-scm-mvn-script'
+      - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
+      - 'policy-drools-applications-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: policy-apex-pdp-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream: 'master'
+    functionality:
+      - 'apex-pdp'
+    trigger_jobs:
+      - 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: policy-distribution-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream: 'master'
+    functionality:
+      - 'distribution'
+    trigger_jobs:
+      - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
     branch: 'master'
index d449ce4..bea6381 100644 (file)
@@ -5,7 +5,16 @@
     jobs:
       - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+          disabled: true
+          build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/distribution'
     stream:
index c23536f..a6ab656 100644 (file)
@@ -3,7 +3,7 @@
     name: policy-drools-applications
     project-name: 'policy-drools-applications'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
index 5ed2a1f..c36a9a4 100644 (file)
@@ -3,7 +3,7 @@
     name: policy-parent
     project-name: 'policy-parent'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
index e497018..5dc2a46 100644 (file)
@@ -3,7 +3,7 @@
     name: policy-xacml-pdp
     project-name: 'policy-xacml-pdp'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
index 111484a..c5667e6 100644 (file)
@@ -7,7 +7,6 @@
     stream: 'master'
     functionality:
       - 'testsuite':
-          trigger_jobs:
-            - 'portal-docker-{stream}-merge-docker-script'
+          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'
index a8e9612..697db46 100644 (file)
@@ -7,7 +7,6 @@
     stream: 'master'
     functionality:
       - 'testsuite':
-          trigger_jobs:
-            - 'portal-docker-{stream}-merge-docker-script'
+          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
     robot-options: ''
     branch: 'master'
index 6c93fa8..9e2db4c 100644 (file)
@@ -3,7 +3,7 @@
     name: portal
     project-name: 'portal'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-release-java-daily'
     project: 'portal'
     stream:
index 0e20414..c5d7261 100644 (file)
@@ -8,19 +8,14 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     functionality:
       - 'sanity':
-          trigger_jobs:
-            - '{project-name}-{stream}-sdc-merge-java'
+          trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
       - 'nightly':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-version-java-daily'
+          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
       - 'uiSanity':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-version-java-daily'
+          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''
     branch: 'master'
     html-dir: 'archives'
-    html-files: 'SDC_CI_Extent_Report.html'
\ No newline at end of file
+    html-files: 'SDC_CI_Extent_Report.html'
index f5e230c..292bf85 100644 (file)
@@ -7,6 +7,10 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-docker-version-java-daily':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: '-DskipTests=true'
     project: 'sdc/dcae-d/ci'
     stream:
       - 'master':
@@ -26,5 +30,6 @@
     project-name: 'sdc-dcae-d-ci'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-ci-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index d2f6233..ae44b01 100644 (file)
@@ -30,5 +30,6 @@
     project-name: 'sdc-dcae-d-dt-be-main'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index e1c63c2..60eebbc 100644 (file)
@@ -26,5 +26,6 @@
     project-name: 'sdc-dcae-d-dt-be-property'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
new file mode 100644 (file)
index 0000000..92eea54
--- /dev/null
@@ -0,0 +1,36 @@
+---
+- project:
+    name: sdc-dcae-d-dt
+    project-name: 'sdc-dcae-d-dt'
+    build-node: ubuntu1604-builder-4c-2g
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'server,docker'
+          mvn-params: '-DskipTests=true'
+    project: 'sdc/dcae-d/dt'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-dcae-d-dt-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+
+- project:
+    name: sdc-dcae-d-dt-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'sdc/dcae-d/dt'
+    project-name: 'sdc-dcae-d-dt'
+    branch: 'master'
+    mvn-settings: 'sdc-dcae-d-dt-settings'
+    mvn-params: '-Dsonar.branch={branch}'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m'
index 4b13a9e..4142e85 100644 (file)
@@ -31,5 +31,6 @@
     project-name: 'sdc-dcae-d-fe'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-fe-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index 1fec7f7..be24d03 100644 (file)
@@ -9,7 +9,6 @@
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
@@ -25,5 +24,6 @@
     project-name: 'sdc-dcae-d-tosca-lab'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m'
index d54ed77..01890a0 100644 (file)
@@ -4,7 +4,7 @@
     name: sdc-jtosca
     project-name: 'sdc-jtosca'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-jtosca-sonar
@@ -29,5 +28,6 @@
     project-name: 'sdc-jtosca'
     branch: 'master'
     mvn-settings: 'sdc-jtosca-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
new file mode 100644 (file)
index 0000000..c0f2d28
--- /dev/null
@@ -0,0 +1,38 @@
+---
+- project:
+    name: sdc-onap-ui-angular-info
+    project-name: 'sdc-onap-ui-angular'
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'sdc/onap-ui-angular'
+    branch: 'master'
+
+- project:
+    name: sdc-onap-ui-angular
+    project-name: 'sdc-onap-ui-angular'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'sdc/onap-ui-angular'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-onap-ui-angular-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn35'
+
+- project:
+    name: sdc-onap-ui-angular-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'sdc/onap-ui-angular'
+    project-name: 'sdc-onap-ui-angular'
+    branch: 'master'
+    mvn-settings: 'sdc-onap-ui-angular-settings'
+    mvn-params: '-Dsonar.branch={branch}'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m'
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
new file mode 100644 (file)
index 0000000..1555c61
--- /dev/null
@@ -0,0 +1,38 @@
+---
+- project:
+    name: sdc-onap-ui-common-info
+    project-name: 'sdc-onap-ui-common'
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'sdc/onap-ui-common'
+    branch: 'master'
+
+- project:
+    name: sdc-onap-ui-common
+    project-name: 'sdc-onap-ui-common'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'sdc/onap-ui-common'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-onap-ui-common-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn35'
+
+- project:
+    name: sdc-onap-ui-common-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'sdc/onap-ui-common'
+    project-name: 'sdc-onap-ui-common'
+    branch: 'master'
+    mvn-settings: 'sdc-onap-ui-common-settings'
+    mvn-params: '-Dsonar.branch={branch}'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m'
diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml
new file mode 100644 (file)
index 0000000..ad1c1d3
--- /dev/null
@@ -0,0 +1,38 @@
+---
+- project:
+    name: sdc-onap-ui-react-info
+    project-name: 'sdc-onap-ui-react'
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'sdc/onap-ui-react'
+    branch: 'master'
+
+- project:
+    name: sdc-onap-ui-react
+    project-name: 'sdc-onap-ui-react'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'sdc/onap-ui-react'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-onap-ui-react-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn35'
+
+- project:
+    name: sdc-onap-ui-react-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'sdc/onap-ui-react'
+    project-name: 'sdc-onap-ui-react'
+    branch: 'master'
+    mvn-settings: 'sdc-onap-ui-react-settings'
+    mvn-params: '-Dsonar.branch={branch}'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m'
index 63ecf8d..2b09a24 100644 (file)
@@ -4,7 +4,7 @@
     name: sdc-onap-ui
     project-name: 'sdc-onap-ui'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     project: 'sdc/onap-ui'
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-onap-ui-sonar
@@ -26,5 +27,6 @@
     project-name: 'sdc-onap-ui'
     branch: 'master'
     mvn-settings: 'sdc-onap-ui-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index 49e286e..90606ad 100644 (file)
@@ -4,7 +4,7 @@
     name: sdc-sdc-distribution-client
     project-name: 'sdc-sdc-distribution-client'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-distribution-client-sonar
@@ -29,5 +28,6 @@
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index 766d0af..c03e353 100644 (file)
@@ -11,9 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
+    maven-version: 'mvn35'
index 4f19ed1..294e82f 100644 (file)
@@ -11,7 +11,6 @@
     name: sdc-sdc-pubsub
     project-name: 'sdc-sdc-pubsub'
     jobs:
-      - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     project: 'sdc/sdc-pubsub'
@@ -22,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-pubsub-sonar
@@ -33,5 +33,6 @@
     project-name: 'sdc-sdc-pubsub'
     branch: 'master'
     mvn-settings: 'sdc-sdc-pubsub-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index d0aac73..128f02c 100644 (file)
@@ -4,7 +4,7 @@
     name: sdc-sdc-titan-cassandra
     project-name: 'sdc-sdc-titan-cassandra'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
@@ -16,3 +16,4 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
index 918194a..8baf6f7 100644 (file)
@@ -4,7 +4,7 @@
     name: sdc-sdc-tosca
     project-name: 'sdc-sdc-tosca'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-tosca-sonar
@@ -29,5 +28,6 @@
     project-name: 'sdc-sdc-tosca'
     branch: 'master'
     mvn-settings: 'sdc-sdc-tosca-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index 8c1b207..a7db7e6 100644 (file)
@@ -3,7 +3,7 @@
     name: sdc-sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-workflow-designer-sonar
@@ -32,5 +31,6 @@
     project-name: 'sdc-sdc-workflow-designer'
     branch: 'master'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index 83520c0..63a0c2e 100644 (file)
@@ -4,26 +4,29 @@
     name: sdc
     project-name: 'sdc'
     jobs:
-      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-verify-java':
+          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - '{project-name}-{stream}-sdc-merge-java':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-      - '{project-name}-{stream}-release-version-java-daily'
+          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+      - '{project-name}-{stream}-release-version-java-daily':
+          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: '-DskipTests=true'
-      - gerrit-maven-clm
+          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+      - gerrit-maven-clm:
+          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     project: 'sdc'
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sonar
@@ -35,6 +38,6 @@
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false'
+    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
index 0738979..755c547 100644 (file)
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: sdnc-apps-docker
+    project-name: 'sdnc-apps'
+    jobs:
+      - 'docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'sdnc/apps'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdnc-apps-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: queue-docker-4c-4g
+
index 1cd1eb9..12d6975 100644 (file)
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'healthcheck':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
     branch: 'master'
index e82b314..c8128a7 100644 (file)
@@ -3,7 +3,7 @@
     name: sdnc-northbound
     project-name: 'sdnc-northbound'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 866408e..7e9b284 100644 (file)
@@ -4,7 +4,7 @@
     name: sdnc-oam
     project-name: 'sdnc-oam'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
deleted file mode 100644 (file)
index 3ce4e12..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- project:
-    name: sdnc-plugins
-    project-name: 'sdnc-plugins'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java-skip-tests'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'sdnc/plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdnc-plugins-settings'
-
-    # due to a strange macro / variable translation problem this needs to be
-    # passed as a string block to properly get the properties correctly defined
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
diff --git a/jjb/so/so-chef-repo.yaml b/jjb/so/so-chef-repo.yaml
deleted file mode 100644 (file)
index 08acb54..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-chef-repo
-    project-name: 'so-chef-repo'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/chef-repo'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-chef-repo-settings'
-    files: '**'
-    archive-artifacts: ''
index 947cde5..288e6f4 100644 (file)
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'integration-testing':
-          trigger_jobs:
-            - 'so-master-docker-version-java-daily'
+          trigger_jobs: 'so-master-docker-version-java-daily'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/so/so-docker-config.yaml b/jjb/so/so-docker-config.yaml
deleted file mode 100644 (file)
index 0d61fc4..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-docker-config
-    project-name: 'so-docker-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/docker-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-docker-config-settings'
-    files: '**'
-    archive-artifacts: ''
index d571cf4..10b6685 100644 (file)
@@ -3,7 +3,7 @@
     name: so-libs
     project-name: 'so-libs'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/so/so-so-config.yaml b/jjb/so/so-so-config.yaml
deleted file mode 100644 (file)
index bf63719..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-so-config
-    project-name: 'so-so-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/so-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-so-config-settings'
-    files: '**'
-    archive-artifacts: ''
diff --git a/jjb/testsuite/testsuite-properties.yaml b/jjb/testsuite/testsuite-properties.yaml
deleted file mode 100644 (file)
index 252a249..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: testsuite-properties-master
-    project-name: 'testsuite-properties'
-    jobs:
-      - gerrit-maven-clm
-    project: 'testsuite/properties'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'testsuite-properties-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
index d5875a2..400170c 100644 (file)
@@ -7,7 +7,6 @@
           path: '.'
           pattern: '**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
 
     project: 'testsuite/python-testing-utils'
index 92d5ffa..f4a4652 100644 (file)
@@ -3,7 +3,6 @@
     name: testsuite
     project-name: 'testsuite'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-3scm-docker-shell-daily':
           script:
             !include-raw-escape: 'testsuite-docker.sh'
index 4774242..afa41dd 100644 (file)
@@ -4,7 +4,7 @@
     project-name: 'ui-dmaapbc'
 
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 34393e1..894be91 100644 (file)
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: usecase-ui-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-8c-8g
-    project: 'usecase-ui'
-    project-name: 'usecase-ui'
-    branch: 'master'
-    mvn-settings: 'usecase-ui-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vfc/build-nfvo-db-docker-image.sh b/jjb/vfc/build-nfvo-db-docker-image.sh
new file mode 100755 (executable)
index 0000000..99eab5d
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./docker/*.*
+
+./docker/build_image.sh
index 5a07ba8..4c5432d 100644 (file)
@@ -13,7 +13,7 @@
           pom: 'lcm/pom.xml'
           pattern: 'lcm/**'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 314c0ac..b90bc54 100644 (file)
@@ -12,7 +12,7 @@
           pom: 'mgr/pom.xml'
           pattern: 'mgr/**'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 1061e71..49e1401 100644 (file)
@@ -13,7 +13,7 @@
           pom: 'res/pom.xml'
           pattern: 'res/**'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 1006430..d27a8f2 100644 (file)
@@ -13,7 +13,7 @@
           path: '.'
           pattern: '**'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
new file mode 100644 (file)
index 0000000..8a4cf5e
--- /dev/null
@@ -0,0 +1,19 @@
+---
+- project:
+    name: vfc-nfvo-db
+    project: 'vfc/nfvo/db'
+    project-name: 'vfc-nfvo-db'
+    mvn-settings: 'vfc-nfvo-db-settings'
+    stream:
+      - 'master':
+          branch: 'master'
+    build-node: ubuntu1604-builder-4c-4g
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-nfvo-db-docker-image.sh'
index 5cc0aec..95805e0 100644 (file)
@@ -13,7 +13,7 @@
           pom: 'ems/pom.xml'
           pattern: 'ems/**'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 0b2aeb8..40a3a61 100644 (file)
@@ -12,7 +12,7 @@
           pom: 'zte/sfc-driver/pom.xml'
           pattern: 'zte/sfc-driver/**'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
index c5cc853..758a625 100644 (file)
@@ -13,7 +13,7 @@
           pom: 'gvnfmadapter/pom.xml'
           pattern: 'gvnfmadapter/**'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
index b8ba2d6..a5cbe02 100644 (file)
@@ -9,10 +9,12 @@
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     mvn-profile: rootOnly
     jobs:
-      - '{project-name}-{stream}-verify-profile-java'
+      - '{project-name}-{stream}-verify-java':
+          mvn-params: '-P rootOnly'
+          pattern: 'pom.xml'
       - '{project-name}-{stream}-merge-profile-java':
-            build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
+          pattern: 'pom.xml'
       - '{project-name}-{stream}-release-version-profile-java-daily'
-    files: 'pom.xml'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
index 0332f12..1173d1c 100644 (file)
@@ -8,7 +8,7 @@
           branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 4265d3f..c4394b8 100644 (file)
@@ -9,7 +9,7 @@
           branch: 'master'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 010539c..cab2b6c 100644 (file)
@@ -9,7 +9,7 @@
           branch: 'master'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
index 28d0712..477c27b 100644 (file)
@@ -19,7 +19,7 @@
           script:
             !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
index 55e0d86..aa59ca9 100644 (file)
@@ -3,7 +3,7 @@
     name: vid
     project-name: 'vid'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
index 223eeef..43eacd8 100644 (file)
     jobs:
       - gerrit-tox-sonar
     cron: 'H 11 * * *'
-    mvn-params: '-f validation-scripts/pom.xml'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vnfsdk/ice'
-    project-name: 'vnfsdk-ice-validation-scripts'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-ice-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: vnfsdk-ice-ice-server-tox-sonar
-    jobs:
-      - gerrit-tox-sonar
-    cron: 'H 11 * * *'
-    mvn-params: '-f ice-server/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'vnfsdk/ice'
-    project-name: 'vnfsdk-ice-ice-server'
+    project-name: 'vnfsdk-ice'
     branch: 'master'
     mvn-settings: 'vnfsdk-ice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
 - project:
     name: vnfsdk-ice-info
     jobs:
@@ -87,3 +71,6 @@
     project: 'vnfsdk/ice'
     project-name: 'vnfsdk-ice'
     branch: 'master'
+    mvn-settings: 'vnfsdk-ice-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 2ed1153..1931f3f 100644 (file)
@@ -16,7 +16,6 @@
     mvn-settings: 'vnfsdk-pkgtools-settings'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
index b0a3a43..733721f 100644 (file)
@@ -14,7 +14,6 @@
     mvn-settings: 'vvp-cms-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
index 01736e1..5646b02 100644 (file)
@@ -14,7 +14,6 @@
     mvn-settings: 'vvp-devkit-settings'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
index d5b2a3c..ca14d16 100644 (file)
@@ -10,5 +10,4 @@
     mvn-settings: 'vvp-documentation-settings'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-python-xc-clm
       - gerrit-tox-verify
index b21bc98..4e88263 100644 (file)
@@ -14,7 +14,6 @@
     mvn-settings: 'vvp-engagementmgr-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
index 9e31eb0..47c553e 100644 (file)
     mvn-settings: 'vvp-gitlab-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
-
-- project:
-    name: vvp-gitlab-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'vvp/gitlab'
-    project-name: 'vvp-gitlab'
-    branch: 'master'
-    mvn-settings: 'vvp-gitlab-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 359344b..f9237da 100644 (file)
@@ -14,7 +14,6 @@
     mvn-settings: 'vvp-image-scanner-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
index 283c159..8d46eba 100644 (file)
     mvn-settings: 'vvp-jenkins-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
-
-- project:
-    name: vvp-jenkins-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'vvp/jenkins'
-    project-name: 'vvp-jenkins'
-    branch: 'master'
-    mvn-settings: 'vvp-jenkins-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index bba7766..6a50154 100644 (file)
     mvn-settings: 'vvp-portal-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
-
-- project:
-    name: vvp-portal-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'vvp/portal'
-    project-name: 'vvp-portal'
-    branch: 'master'
-    mvn-settings: 'vvp-portal-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 0790140..22b60ef 100644 (file)
     mvn-settings: 'vvp-postgresql-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
-
-- project:
-    name: vvp-postgresql-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'vvp/postgresql'
-    project-name: 'vvp-postgresql'
-    branch: 'master'
-    mvn-settings: 'vvp-postgresql-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index ad7b1c1..8dd6cd9 100644 (file)
     mvn-settings: 'vvp-test-engine-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
-
-- project:
-    name: vvp-test-engine-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'vvp/test-engine'
-    project-name: 'vvp-test-engine'
-    branch: 'master'
-    mvn-settings: 'vvp-test-engine-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 6100c0e..1e759cb 100644 (file)
@@ -14,7 +14,6 @@
     mvn-settings: 'vvp-validation-scripts-settings'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
 
 - project:
index 79c9861..0029afe 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 79c9861692c6e965b5e95e721857bf81290fc576
+Subproject commit 0029afef91fd71afbd62ad41d09a3c4b05cceaa8
index 6de720c..7bb1c03 100644 (file)
@@ -5,6 +5,7 @@
   become_user: root
   become_method: sudo
   vars:
+    apt_file: /etc/apt/sources.list.d/google-chrome.list
     docker_compose_version: 1.17.1
     glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c
     glide_version: v0.13.1
 
   tasks:
     - name: 'Install Docker Compose {{docker_compose_version}}'
-      command: curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/{{docker_compose_version}}/docker-compose-$(uname -s)-$(uname -m)"
+      command: curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/{{docker_compose_version}}/docker-compose-Linux-x86_64"
+      become: true
+
+    - file:
+        path: /usr/local/bin/docker-compose
+        mode: "+x"
       become: true
 
     - name: 'Install GoLang {{golang_version}}'
             dest: /usr/local
             remote_src: true
           become: true
-        - name: 'Add golang to PATH'
-          command: 'echo "export PATH=$PATH:/usr/local/go/bin" >> /etc/profile'
+        - name: Create symbolic link to go bin
+          file:
+            src: "/usr/local/go/bin/go"
+            dest: "/usr/bin/go"
+            state: link
           become: true
+
+    - name: Install libxml2-utils
+      apt:
+        name: libxml2-utils
+        state: present
+      become: true
+
+    - name: Install python-tox
+      apt:
+        name: python-tox
+        state: present
+      become: true
+
+    - apt_repository:
+        repo: ppa:jonathonf/python-3.6
+        state: present
+      become: true
+
+    - name: Update and upgrade apt packages
+      apt:
+        upgrade: yes
+        update_cache: yes
+      become: true
+
+    - name: Install Python 3.6 and packages
+      apt:
+        name:
+          - python3.6
+          - python3.6-dev
+          - libssl-dev
+          - libmysqlclient-dev
+          - gcc
+      become: true
+
+    - name: Install base packages
+      apt:
+        name:
+          - unzip
+          - xz-utils
+          - libxml-xpath-perl
+          - wget
+          - make
+          - npm
+          - sshuttle
+          - netcat
+          - libssl-dev
+          - libffi-dev
+      become: true
+
+    - name: Install autorelease support packages
+      apt:
+        name:
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
+      become: true
+
+    - name: Add Google Chrome key
+      apt_key:
+        url: https://dl-ssl.google.com/linux/linux_signing_key.pub
+        state: present
+      become: true
+
+    - name: Add Google Chrome repo
+      copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644
+      become: true
+
+    - name: Update apt cache
+      apt: update_cache=yes
+      become: true
+
+    - name: Install Google Chrome
+      apt:
+        name: google-chrome-stable
+        state: present
+      become: true
+
+    - name: Install Erlang dependency packages
+      apt:
+        name:
+          - libwxgtk3.0-0v5
+          - libsctp1
+          - libwxbase3.0-0v5
+      become: true
+
+    - name: Install Erlang
+      apt:
+        deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
+      install_recommends: yes
+      become: true
+
+    - name: Clone rebar3
+      git:
+        repo: 'https://github.com/erlang/rebar3.git'
+        dest: /tmp/rebar3
+
+    - name: Bootstrap rebar3
+      command: ./bootstrap
+      args:
+        chdir: /tmp/rebar3
+
+    - name: Install rebar3 to bin
+      copy:
+        src: /tmp/rebar3/rebar3
+        dest: /usr/bin/rebar3
+        mode: 0755
+        remote_src: true
+      become: true
+
+    - name: Remove unused rebar3 source
+      file:
+        path: /tmp/rebar3
+        state: absent
+
+    - name: Download geckodriver
+      unarchive:
+        src: https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz
+        dest: /usr/bin
+        mode: 0755
+        remote_src: yes
+      become: true
+
+    - name: Download Firefox version 55.0.3
+      unarchive:
+        src: https://download-installer.cdn.mozilla.net/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2
+        dest: /tmp
+        mode: 0755
+        remote_src: yes
+      become: true
+
+    - name: Create symbolic link to firefox bin
+      file:
+        src: "/usr/bin/firefox-bin/firefox/firefox"
+        dest: "/usr/bin/firefox"
+        state: link
+      become: true
diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh
new file mode 100644 (file)
index 0000000..fb2f810
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Ensure we fail the job if any steps fail
+set -e -o pipefail
+
+# client only init, tiller will not be installed
+helm init --client-only
+cd kubernetes/ || exit
+make repo
+cd ..
diff --git a/shell/publish_helm_charts.sh b/shell/publish_helm_charts.sh
new file mode 100755 (executable)
index 0000000..02a0c74
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e -o pipefail
+cd kubernetes/dist/packages/ || exit
+helm_charts=()
+while IFS= read -a line; do
+    helm_charts+=( "$line" )
+done < <( ls )
+
+for chart in "${helm_charts[@]}"; do
+  chart=$(echo "$chart" | xargs)
+  case "$BUILD_TYPE" in
+    'snapshot')
+      echo "-n --upload-file $chart https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GIT_COMMIT/$chart"
+      ;;
+    'staging')
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GIT_COMMIT/$chart"
+      ;;
+    'release')
+      echo "Release automation not implemented yet."
+      exit 1
+        ;;
+    *)
+      echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."
+      exit 1
+      ;;
+  esac
+done
+cd ../../../