summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aaf/aaf-sms-csit.yaml14
-rw-r--r--jjb/aai/aai-sparky-be.yaml2
-rw-r--r--jjb/ccsdk/dashboard.yaml33
-rw-r--r--jjb/ccsdk/platform-nbapi.yaml34
-rw-r--r--jjb/ci-management/ci-management-packer-jobs.yaml71
-rw-r--r--jjb/ci-management/ci-management.yaml24
-rw-r--r--jjb/externalapi/externalapi-nbi.yaml (renamed from jjb/dmaap/dmaap-datarouter.yaml)21
-rw-r--r--jjb/global-defaults.yaml4
m---------jjb/global-jjb0
-rw-r--r--jjb/global-macros.yaml8
-rw-r--r--jjb/global-templates-java.yaml4
-rw-r--r--jjb/modeling/modeling-toscaparsers-nfvparser.yaml14
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml21
-rw-r--r--jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml3
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent.yaml3
15 files changed, 155 insertions, 101 deletions
diff --git a/jjb/aaf/aaf-sms-csit.yaml b/jjb/aaf/aaf-sms-csit.yaml
new file mode 100644
index 000000000..21581495c
--- /dev/null
+++ b/jjb/aaf/aaf-sms-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aaf-sms-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'aaf'
+ stream: 'master'
+ functionality:
+ - 'sms-test-plan':
+ trigger_jobs:
+ - 'aaf-sms-master-docker-golang-shell-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 3a1f2e05b..42b16fc40 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -8,7 +8,7 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'pom.xml'
+ pom: 'sparkybe-onap-application/pom.xml'
mvn-goals: 'docker:build'
project: 'aai/sparky-be'
stream:
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
deleted file mode 100644
index f28d88145..000000000
--- a/jjb/ccsdk/dashboard.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
- name: ccsdk-dashboard
- project-name: 'ccsdk-dashboard'
- jobs:
- - gerrit-maven-clm:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
-
- project: 'ccsdk/dashboard'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'ccsdk-dashboard-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-dashboard-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-builder-4c-4g
- project: 'ccsdk/dashboard'
- project-name: 'ccsdk-dashboard'
- branch: 'master'
- mvn-settings: 'ccsdk-dashboard-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml
deleted file mode 100644
index 9075905bf..000000000
--- a/jjb/ccsdk/platform-nbapi.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- project:
- name: ccsdk-platform-nbapi
- project-name: 'ccsdk-platform-nbapi'
- jobs:
- - gerrit-maven-clm:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'ccsdk/platform/nbapi'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'ccsdk-platform-nbapi-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-platform-nbapi-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-builder-4c-4g
- project: 'ccsdk/platform/nbapi'
- project-name: 'ccsdk-platform-nbapi'
- branch: 'master'
- mvn-settings: 'ccsdk-platform-nbapi-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
new file mode 100644
index 000000000..f78186112
--- /dev/null
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -0,0 +1,71 @@
+---
+- project:
+ name: packer-builder-jobs
+ jobs:
+ - gerrit-packer-merge
+
+ project: ci-management
+ project-name: ci-management
+ branch: master
+ archive-artifacts: '**/*.log'
+
+ build-node: centos7-builder-2c-1g
+ build-timeout: 90
+
+ platforms:
+ - centos-7
+ - ubuntu-16.04
+ templates: builder
+
+- project:
+ name: packer-docker-jobs
+ jobs:
+ - gerrit-packer-merge
+
+ project: ci-management
+ project-name: ci-management
+ branch: master
+ archive-artifacts: '**/*.log'
+
+ build-node: centos7-builder-2c-1g
+ build-timeout: 60
+
+ platforms:
+ - centos-7
+ - ubuntu-16.04
+ templates: docker
+
+- project:
+ name: packer-memcached-jobs
+ jobs:
+ - gerrit-packer-merge
+
+ project: ci-management
+ project-name: ci-management
+ branch: master
+ archive-artifacts: '**/*.log'
+
+ build-node: centos7-builder-2c-1g
+ build-timeout: 90
+
+ platforms:
+ - centos-7
+ - ubuntu-16.04
+ templates: memcached
+
+- project:
+ name: packer-redis-jobs
+ jobs:
+ - gerrit-packer-merge
+
+ project: ci-management
+ project-name: ci-management
+ branch: master
+ archive-artifacts: '**/*.log'
+
+ build-node: centos7-builder-2c-1g
+
+ platforms:
+ - centos-7
+ - ubuntu-16.04
+ templates: redis
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 16ae88bc1..6f2a3db8e 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -3,6 +3,7 @@
name: ci-management-jobs
jobs:
- '{project-name}-ci-jobs'
+ - gerrit-packer-verify
project: 'ci-management'
project-name: 'ci-management'
@@ -12,29 +13,6 @@
build-node: 'centos7-builder-2c-1g'
jjb-version: 2.0.0
-- project:
- name: packer-jobs
- # packer jobs templates are defined in global-jjb
- jobs:
- - '{project-name}-packer-jobs'
- project: 'ci-management'
- project-name: 'ci-management'
- branch: master
- archive-artifacts: '**/*.log'
- build-node: 'ubuntu1604-builder-4c-4g'
- platforms:
- - centos
- - ubuntu-16.04
- templates:
- - builder
- - docker
- - memcached
- - redis
- exclude:
- # only build the docker image on ubuntu at present
- - platforms: centos
- templates: docker
-
- job-template:
name: '{project}-verify-jjb'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/externalapi/externalapi-nbi.yaml
index d9548cf01..592a886ad 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -1,27 +1,32 @@
---
- project:
- name: dmaap-datarouter
- project-name: 'dmaap-datarouter'
+ name: externalapi-nbi
+ project-name: 'externalapi-nbi'
jobs:
- gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- project: 'dmaap/datarouter'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ project: 'externalapi/nbi'
stream:
- 'master':
branch: 'master'
- mvn-settings: 'dmaap-datarouter-settings'
+ mvn-settings: 'externalapi-nbi-settings'
files: '**'
archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
- project:
- name: dmaap-datarouter-sonar
+ name: externalapi-nbi-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-builder-4c-4g
- project: 'dmaap/datarouter'
- project-name: 'dmaap-datarouter'
+ project: 'externalapi/nbi'
+ project-name: 'externalapi-nbi'
branch: 'master'
- mvn-settings: 'dmaap-datarouter-settings'
+ mvn-settings: 'externalapi-nbi-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 64f6a74eb..450355ff2 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -14,6 +14,9 @@
# lf-infra defaults
lftools-version: <1.0.0
+ # packer_version
+ packer-version: 1.1.3
+
# default gerrit server definition
server-name: 'Primary'
gerrit-server-name: 'Primary'
@@ -22,6 +25,7 @@
jdk: ''
# Maven
+ mvn-params: ''
onap-infra-mvn-opts: |
--show-version
--batch-mode
diff --git a/jjb/global-jjb b/jjb/global-jjb
-Subproject aa205517366205dd017d0801bd0cfe104e742c1
+Subproject 90e4e825b3d0ac5959122c50e457419ad0cfe13
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 6be0e0f94..27167b67e 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -123,6 +123,14 @@
description: 'Used by Heat to generate a unique stack & vm name'
- parameter:
+ name: maven-params
+ parameters:
+ - string:
+ name: MAVEN_PARAMS
+ default: '{mvn-params}'
+ description: Maven parameters to pass to the mvn command.
+
+- parameter:
name: maven-exec
parameters:
- string:
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 210ed9b82..171fdb191 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -90,6 +90,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
@@ -115,7 +117,7 @@
- maven-target:
maven-version: '{maven-version}'
goals: 'clean install -B
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 5cdeea23d..c2a49e490 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -21,3 +21,17 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
+
+- project:
+ name: modeling-toscaparsers-nfvparser-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'modeling/toscaparsers'
+ project-name: 'modeling-toscaparsers-nfvparser'
+ branch: 'master'
+ mvn-params: '-f nfvparser/pom.xml'
+ mvn-settings: 'modeling-toscaparsers-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
new file mode 100644
index 000000000..5fbd144e5
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-root
+ project-name: 'vfc-nfvo-driver-svnfm-root'
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+ mvn-params: '-pl nokia,nokiav2,huawei,zte'
+ subproject:
+ - 'drv-vnfm-root':
+ pom: 'pom.xml'
+ pattern: 'pom.xml'
+ jobs:
+ - '{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
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 17760b614..cee261684 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -21,6 +21,9 @@
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{subproject}-python-staging-{stream}'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
- project:
name: vnfsdk-dovetail-integration-sonar
jobs:
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 05fdcbd91..95f9b8a85 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -9,7 +9,8 @@
jobs:
- gerrit-maven-clm:
mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-verify-java':
+ mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'