summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/aai/aai-aai-service.yaml1
-rw-r--r--jjb/aai/aai-data-router.yaml1
-rw-r--r--jjb/aai/aai-model-loader.yaml1
-rw-r--r--jjb/aai/aai-resources.yaml1
-rw-r--r--jjb/aai/aai-search-data-service.yaml1
-rw-r--r--jjb/aai/aai-sparky-be.yaml1
-rw-r--r--jjb/aai/aai-traversal.yaml1
-rw-r--r--jjb/appc/appc-deployment.yaml2
-rw-r--r--jjb/dmaap/dmaap-datarouter-docker.yaml34
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml2
-rw-r--r--jjb/msb/msb-csit.yaml3
-rw-r--r--jjb/multicloud/build-multicloud-openstack-docker-image.sh12
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml5
-rw-r--r--jjb/sdc/sdc-jtosca.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml2
-rw-r--r--jjb/usecaseui/usecase-ui-server.yaml16
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml8
18 files changed, 82 insertions, 13 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
index 1b2b31f76..01d5cfda1 100644
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -7,7 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-docker-image-blessing'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index ef347d492..0fd44b9cb 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -7,7 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
- - '{project-name}-docker-image-blessing'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index f93210b3c..04209dcbc 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -7,7 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
- - '{project-name}-docker-image-blessing'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 1269de9df..b2c1bd51a 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -7,7 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-docker-image-blessing'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 80e0f52cf..eba07d899 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -7,7 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
- - '{project-name}-docker-image-blessing'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 426cacd63..a3ac26b35 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -7,7 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
- - '{project-name}-docker-image-blessing'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 8d65752ec..fa198c90f 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -7,7 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-docker-image-blessing'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index c5b0dd134..daa68ad9f 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -7,7 +7,7 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-docker-java-daily'
- '{project-name}-{stream}-docker-version-java-daily'
- '{project-name}-docker-image-blessing'
diff --git a/jjb/dmaap/dmaap-datarouter-docker.yaml b/jjb/dmaap/dmaap-datarouter-docker.yaml
new file mode 100644
index 000000000..873affde8
--- /dev/null
+++ b/jjb/dmaap/dmaap-datarouter-docker.yaml
@@ -0,0 +1,34 @@
+---
+
+- project:
+ name: dmaap-datarouter-docker
+ project-name: 'dmaap-datarouter-docker'
+ jobs:
+ - '{project-name}-{stream}-clm'
+ - '{project-name}-{stream}-verify-java-checkstyle'
+ - '{project-name}-{stream}-merge-properties-java':
+ mvn_properties:
+ - docker.pull.registry=nexus3.onap.org:10001
+ - docker.push.registry=nexus3.onap.org:10003
+ - '{project-name}-{stream}-release-java-daily-checkstyle':
+ mvn_properties:
+ - skipDockerBuild=true
+ - skipDockerTag=true
+ - skipDockerPush=true
+ - '{project-name}-{stream}-docker-java-properties-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ maven-properties: |
+ skip.docker.build=false
+ skip.docker.tag=false
+ skip.docker.push=false
+ dmaap-datarouter-docker.registry=$
+
+ project: 'dmaap/datarouter'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dmaap-datarouter-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 6e8a84602..89e78eca7 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -8,7 +8,7 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-stage-site-java':
- site-pom: 'dmaap/datarouter/pom.xml'
+ site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
mvn-goals: 'clean install'
project: 'dmaap/datarouter'
diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
index f5a283a32..9dada47b6 100644
--- a/jjb/msb/msb-csit.yaml
+++ b/jjb/msb/msb-csit.yaml
@@ -16,5 +16,8 @@
- 'tcp-service':
trigger_jobs:
- 'msb-discovery-master-docker-java-version-shell-daily'
+ - 'iag-redirect-discovery':
+ trigger_jobs:
+ - 'msb-discovery-master-docker-java-version-shell-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
new file mode 100644
index 000000000..671f65f7c
--- /dev/null
+++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./openstack/newton/docker/*.*
+chmod 755 ./openstack/ocata/docker/*.*
+
+./openstack/newton/docker/build_image.sh
+./openstack/ocata/docker/build_image.sh
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index f58ebf7fd..84404e3be 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -20,6 +20,11 @@
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-memcached-4c-4g'
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 89e59c902..38fbcd401 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-1.1.0':
+ branch: 'release-1.1.0'
mvn-settings: 'sdc-jtosca-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 135e6071d..23ef85ad1 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -18,6 +18,8 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'release-1.1.0':
+ branch: 'release-1.1.0'
mvn-settings: 'sdc-sdc-distribution-client-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 804d26518..230fdbb19 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-1.1.0':
+ branch: 'release-1.1.0'
mvn-settings: 'sdc-sdc-tosca-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
new file mode 100644
index 000000000..38c7b34bf
--- /dev/null
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -0,0 +1,16 @@
+---
+
+- project:
+ name: usecase-ui-server
+ project-name: 'usecase-ui-server'
+ project: 'usecase-ui/server'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'usecase-ui-server-settings'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 02de1a340..890ff8604 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -7,13 +7,13 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'vnfmarket-be/deployment/docker/pom.xml'
+ pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
mvn-goals: 'docker:build'
docker-image-name: 'onap/refrepo'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
+ mvn-profile: 'docker'
project: 'vnfsdk/refrepo'
stream: