Merge "Modify the trigger job for vfc-resmanagement"
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index f10fc82..8c5b20d 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.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: 'aaf/cadi/pom.xml'
+ site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
mvn-goals: 'clean install'
project: 'aaf/cadi'
diff --git a/jjb/aaf/aaf-csit.yaml b/jjb/aaf/aaf-csit.yaml
new file mode 100644
index 0000000..aec49b3
--- /dev/null
+++ b/jjb/aaf/aaf-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aaf-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'aaf'
+ stream: 'master'
+ functionality:
+ - 'aafapi':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily-checkstyle'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml
index b3bfbd6..2097444 100644
--- a/jjb/aaf/aaf-inno.yaml
+++ b/jjb/aaf/aaf-inno.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: 'aaf/inno/pom.xml'
+ site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
mvn-goals: 'clean install'
project: 'aaf/inno'
diff --git a/jjb/aai/aai-esr-server-csit.yaml b/jjb/aai/aai-esr-server-csit.yaml
new file mode 100644
index 0000000..21bd5ae
--- /dev/null
+++ b/jjb/aai/aai-esr-server-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-esr-server-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'aai-esr-server'
+ stream: 'master'
+ functionality:
+ - 'sanity-check':
+ trigger_jobs:
+ - 'aai-esr-server-master-docker-java-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
new file mode 100644
index 0000000..79b0f68
--- /dev/null
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: ccsdk-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'ccsdk'
+ stream: 'master'
+ functionality:
+ - 'healthcheck':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily-checkstyle'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml
index 3f56730..2ea6d1e 100644
--- a/jjb/clamp/clamp-csit.yaml
+++ b/jjb/clamp/clamp-csit.yaml
@@ -7,7 +7,7 @@
project-name: 'clamp'
stream: 'master'
functionality:
- - 'TCA':
+ - 'APIs':
trigger_jobs:
- '{project-name}-{stream}-release-java-daily-checkstyle'
- 'UIs':
diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml
new file mode 100644
index 0000000..62f53b8
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-csit.yaml
@@ -0,0 +1,13 @@
+- project:
+ name: dcaegen2-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'dcaegen2'
+ stream: 'master'
+ functionality:
+ - 'testsuites':
+ trigger_jobs:
+ - 'dcaegen2-master-release-version-java-daily-no-sonar'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 26a23d2..9ebc0dd 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -1,8 +1,8 @@
---
- project:
- name: dmaap-messsagerouter-docker
- project-name: 'dmaap-messsagerouter-docker'
+ name: dmaap-messagerouter-docker
+ project-name: 'dmaap-messagerouter-docker'
jobs:
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
@@ -15,7 +15,7 @@
stream:
- 'master':
branch: 'master'
- mvn-settings: 'dmaap-messsagerouter-messageservice-settings'
+ mvn-settings: 'dmaap-messagerouter-messageservice-settings'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
new file mode 100644
index 0000000..92125d4
--- /dev/null
+++ b/jjb/integration/integration-docker.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+ name: integration-docker
+ project-name: 'integration'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-docker-merge'
+ - '{project-name}-{stream}-{subproject}-docker-verify'
+ project: 'integration'
+ stream:
+ - 'master':
+ branch: 'master'
+ subproject:
+ - 'sniroemulator':
+ pom: 'test/mocks/sniroemulator/pom.xml'
+ pattern: 'test/mocks/sniroemulator/**'
+ mvn-settings: 'integration-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
new file mode 100644
index 0000000..c8041a2
--- /dev/null
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -0,0 +1,127 @@
+---
+- job-template:
+ name: '{project-name}-{stream}-{subproject}-docker-merge'
+ project-type: freestyle
+ node: 'ubuntu1604-docker-8c-8g'
+ docker-image-name: ''
+
+ 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}'
+ - docker-image-name:
+ docker-image-name: '{docker-image-name}'
+
+ 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-patch-merged:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '{pattern}'
+
+ builders:
+
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+
+ - docker-login
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ goals: 'clean package docker:build docker:push'
+ 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:
+ name: '{project-name}-{stream}-{subproject}-docker-verify'
+ project-type: freestyle
+ node: 'ubuntu1604-docker-8c-8g'
+ docker-image-name: ''
+
+ 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}'
+ - docker-image-name:
+ docker-image-name: '{docker-image-name}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+ 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}'
+
+ - docker-login
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ goals: 'clean package docker:build'
+ 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}'
+
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index f6927ad..6e0951c 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -14,6 +14,10 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-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}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
new file mode 100644
index 0000000..0fee3ec
--- /dev/null
+++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: multicloud-openstack-windriver-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'multicloud-windriver'
+ stream: 'master'
+ functionality:
+ - 'functionality1':
+ trigger_jobs:
+ - 'multicloud-openstack-master-docker-java-version-shell-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 2b94b98..5a740bd 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -18,6 +18,7 @@
mvn-settings: 'policy-drools-pdp-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
- project:
name: policy-drools-pdp-release-1.0.0
project-name: 'policy-drools-pdp'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index e8af204..afd10fa 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -8,6 +8,7 @@
- '{project-name}-{stream}-sdc-merge-java':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ - '{project-name}-{stream}-release-java-daily'
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker,docker-staging'
@@ -20,6 +21,8 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'release-1.1.0':
+ branch: 'release-1.1.0'
mvn-settings: 'sdc-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml
index ffd080b..517e170 100644
--- a/jjb/sdnc/sdnc-adaptors.yaml
+++ b/jjb/sdnc/sdnc-adaptors.yaml
@@ -15,8 +15,6 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- 'release-1.1.0':
branch: 'release-1.1.0'
mvn-settings: 'sdnc-adaptors-settings'
diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml
index 4a1e78e..8c12bc2 100644
--- a/jjb/sdnc/sdnc-core.yaml
+++ b/jjb/sdnc/sdnc-core.yaml
@@ -22,8 +22,6 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- 'release-1.1.0':
branch: 'release-1.1.0'
mvn-settings: 'sdnc-core-settings'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 521fd48..17f32f4 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -15,8 +15,6 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- 'release-1.1.0':
branch: 'release-1.1.0'
mvn-settings: 'sdnc-northbound-settings'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 7b3b0bd..c7e22fd 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -19,8 +19,6 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- 'release-1.1.0':
branch: 'release-1.1.0'
mvn-settings: 'sdnc-oam-settings'
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
index 84c7ec8..fa11385 100644
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ b/jjb/sdnc/sdnc-plugins.yaml
@@ -15,8 +15,6 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- 'release-1.1.0':
branch: 'release-1.1.0'
mvn-settings: 'sdnc-plugins-settings'
diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/usecaseui/usecase-ui-server-csit.yaml
new file mode 100644
index 0000000..679cc30
--- /dev/null
+++ b/jjb/usecaseui/usecase-ui-server-csit.yaml
@@ -0,0 +1,13 @@
+- project:
+ name: usecase-ui-server-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'usecase-ui-server'
+ stream: 'master'
+ functionality:
+ - 'testsuite':
+ trigger_jobs:
+ - 'usecase-ui-server-{stream}-version-docker-java-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 38c7b34..6f16c12 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -11,6 +11,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-docker-java-daily'
files: '**'
archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: docker
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 4e57d76..6cb182b 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -11,6 +11,7 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/build-nfvo-wfengine-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-docker-image.sh
new file mode 100644
index 0000000..de7d13b
--- /dev/null
+++ b/jjb/vfc/build-nfvo-wfengine-docker-image.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./activiti-extension/src/main/docker/*.sh
+./activiti-extension/src/main/docker/activiti-docker-build_image.sh
+
+chmod 755 ./wfenginemgrservice/src/main/docker/*.sh
+./wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
+
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
new file mode 100644
index 0000000..62a06ae
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-nokia
+ project-name: 'vfc-nfvo-driver-svnfm'
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+ subproject:
+ - 'drv-vnfm-nokia':
+ pom: 'nokia/vnfmdriver/pom.xml'
+ pattern: 'nokia/vnfmdriver/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-java-daily'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
new file mode 100644
index 0000000..91bad74
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: vfc-nfvo-wfengine-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'vfc-nfvo-wfengine'
+ stream: 'master'
+ functionality:
+ - 'sanity-check':
+ trigger_jobs:
+ - 'vfc-nfvo-wfengine-master-docker-java-version-shell-daily'
+ robot-options: ''
+ branch: 'master'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index cf9bf18..399d934 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -19,6 +19,11 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-java-daily'
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-nfvo-wfengine-docker-image.sh'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
new file mode 100644
index 0000000..46e1688
--- /dev/null
+++ b/jjb/vid/vid-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: vid-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'vid'
+ stream: 'master'
+ functionality:
+ - 'healthCheck':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily-checkstyle'
+ robot-options: ''
+ branch: 'master'