summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg2
-rw-r--r--jjb/dcaegen2/dcaegen2-services-son-handler.yaml45
-rw-r--r--jjb/vvp/vvp-cms.yaml39
-rw-r--r--jjb/vvp/vvp-devkit.yaml19
-rw-r--r--jjb/vvp/vvp-engagementmgr.yaml34
-rw-r--r--jjb/vvp/vvp-gitlab.yaml21
-rw-r--r--jjb/vvp/vvp-image-scanner.yaml34
-rw-r--r--jjb/vvp/vvp-jenkins.yaml21
-rw-r--r--jjb/vvp/vvp-portal.yaml21
-rw-r--r--jjb/vvp/vvp-postgresql.yaml21
-rw-r--r--jjb/vvp/vvp-test-engine.yaml21
11 files changed, 46 insertions, 232 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
index 60167f281..db219ca50 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190123-052615.439
LABELS=ubuntu1604-docker-8c-8g
HARDWARE_ID=v2-highcpu-8
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
new file mode 100644
index 000000000..6b6243600
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -0,0 +1,45 @@
+---
+- project:
+ name: dcaegen2-services-son-handler
+ project-name: 'dcaegen2-services-son-handler'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+
+ project: 'dcaegen2/services/son-handler'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
+ mvn-settings: 'dcaegen2-services-son-handler-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-docker-8c-8g'
+ maven-deploy-properties: |
+ deployAtEnd=true
+
+- project:
+ name: dcaegen2-services-son-handler-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: '@daily'
+ build-node: ubuntu1604-docker-8c-8g
+ project: 'dcaegen2/services/son-handler'
+ project-name: 'dcaegen2-services-son-handler'
+ branch: 'master'
+ mvn-settings: 'dcaegen2-services-son-handler-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: dcaegen2-services-son-handler-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: dcaegen2/services/son-handler
+ build-node: ubuntu1604-docker-8c-8g
+ project-name: 'dcaegen2-services-son-handler'
+ branch: 'master'
+ mvn-settings: 'dcaegen2-services-son-handler-settings'
diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
deleted file mode 100644
index 24444c8a1..000000000
--- a/jjb/vvp/vvp-cms.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
- name: vvp-project-view
- project-name: vvp
- views:
- - project-view
-
-- project:
- name: vvp-cms
- project-name: 'vvp-cms'
- project: 'vvp/cms'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-cms-settings'
- build-node: ubuntu1604-docker-8c-8g
- jobs:
- - '{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-cms-sonar
- jobs:
- - gerrit-maven-sonar
- cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
- project: 'vvp/cms'
- project-name: 'vvp-cms'
- branch: 'master'
- mvn-settings: 'vvp-cms-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-devkit.yaml b/jjb/vvp/vvp-devkit.yaml
deleted file mode 100644
index 5646b02de..000000000
--- a/jjb/vvp/vvp-devkit.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-
-- project:
- name: vvp-devkit
- project-name: 'vvp-devkit'
- project: 'vvp/devkit'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-devkit-settings'
- build-node: ubuntu1604-builder-4c-4g
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- docker-pom: 'pom.xml'
- mvn-profile: 'default'
diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
deleted file mode 100644
index 191909048..000000000
--- a/jjb/vvp/vvp-engagementmgr.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-
-- project:
- name: vvp-engagementmgr
- project-name: 'vvp-engagementmgr'
- project: 'vvp/engagementmgr'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-engagementmgr-settings'
- build-node: ubuntu1604-docker-8c-8g
- jobs:
- - '{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-engagementmgr-sonar
- jobs:
- - gerrit-maven-sonar
- cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
- project: 'vvp/engagementmgr'
- project-name: 'vvp-engagementmgr'
- branch: 'master'
- mvn-settings: 'vvp-engagementmgr-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml
deleted file mode 100644
index 47c553ea6..000000000
--- a/jjb/vvp/vvp-gitlab.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
- name: vvp-gitlab
- project-name: 'vvp-gitlab'
- project: 'vvp/gitlab'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-gitlab-settings'
- build-node: ubuntu1604-docker-8c-8g
- jobs:
- - '{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'
diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml
deleted file mode 100644
index bdb7bda60..000000000
--- a/jjb/vvp/vvp-image-scanner.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-
-- project:
- name: vvp-image-scanner
- project-name: 'vvp-image-scanner'
- project: 'vvp/image-scanner'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-image-scanner-settings'
- build-node: ubuntu1604-docker-8c-8g
- jobs:
- - '{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-image-scanner-sonar
- jobs:
- - gerrit-maven-sonar
- cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
- project: 'vvp/image-scanner'
- project-name: 'vvp-image-scanner'
- branch: 'master'
- mvn-settings: 'vvp-image-scanner-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
deleted file mode 100644
index 8d46eba02..000000000
--- a/jjb/vvp/vvp-jenkins.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
- name: vvp-jenkins
- project-name: 'vvp-jenkins'
- project: 'vvp/jenkins'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-jenkins-settings'
- build-node: ubuntu1604-docker-8c-8g
- jobs:
- - '{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'
diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml
deleted file mode 100644
index 6a5015443..000000000
--- a/jjb/vvp/vvp-portal.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
- name: vvp-portal
- project-name: 'vvp-portal'
- project: 'vvp/portal'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-portal-settings'
- build-node: ubuntu1604-docker-8c-8g
- jobs:
- - '{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'
diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml
deleted file mode 100644
index 22b60efe8..000000000
--- a/jjb/vvp/vvp-postgresql.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
- name: vvp-postgresql
- project-name: 'vvp-postgresql'
- project: 'vvp/postgresql'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-postgresql-settings'
- build-node: ubuntu1604-docker-8c-8g
- jobs:
- - '{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'
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
deleted file mode 100644
index 8dd6cd9a4..000000000
--- a/jjb/vvp/vvp-test-engine.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
- name: vvp-test-engine
- project-name: 'vvp-engine'
- project: 'vvp/test-engine'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-test-engine-settings'
- build-node: ubuntu1604-docker-8c-8g
- jobs:
- - '{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'