summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/integration/integration-ieft-actn-tools.yaml46
-rw-r--r--jjb/integration/integration-ietf-actn-tools.yaml33
-rw-r--r--jjb/so/so-adapters-so-cnf-adapter.yaml6
-rw-r--r--jjb/so/so-adapters-so-etsi-sol003-adapter.yaml14
-rw-r--r--jjb/so/so-adapters-so-etsi-sol005-adapter.yaml6
-rw-r--r--jjb/so/so-adapters-so-nssmf-adapter.yaml6
-rw-r--r--jjb/so/so-adapters-so-oof-adapter.yaml6
-rw-r--r--jjb/so/so-so-admin-cockpit.yaml14
-rw-r--r--jjb/so/so-so-etsi-nfvo.yaml14
9 files changed, 99 insertions, 46 deletions
diff --git a/jjb/integration/integration-ieft-actn-tools.yaml b/jjb/integration/integration-ieft-actn-tools.yaml
deleted file mode 100644
index 264ecdd16..000000000
--- a/jjb/integration/integration-ieft-actn-tools.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- project:
- name: integration-ieft-actn-tools-project-view
- project-name: integration-ieft-actn-tools
- views:
- - project-view
-
-- project:
- name: integration-ieft-actn-tools-info
- project: integration/ieft-actn-tools
- project-name: integration-ieft-actn-tools
- build-node: centos7-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
-
-- project:
- name: integration-ieft-actn-tools-linters
- project: integration/ieft-actn-tools
- project-name: integration-ieft-actn-tools
- python-version: python3
- jobs:
- - integration-linters
- subproject:
- - 'yaml':
- tox-dir: '.'
- tox-envs: 'yaml'
- pattern: '**/*.yaml'
- - 'yml':
- tox-dir: '.'
- tox-envs: 'yaml'
- pattern: '**/*.yml'
- - 'json':
- tox-dir: '.'
- tox-envs: 'json'
- pattern: '**/*.json'
- - 'python':
- tox-dir: '.'
- tox-envs: 'py'
- pattern: '**/*.py'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
- stream:
- - 'master':
- branch: 'master'
diff --git a/jjb/integration/integration-ietf-actn-tools.yaml b/jjb/integration/integration-ietf-actn-tools.yaml
index 46d514dce..4618462da 100644
--- a/jjb/integration/integration-ietf-actn-tools.yaml
+++ b/jjb/integration/integration-ietf-actn-tools.yaml
@@ -12,3 +12,36 @@
build-node: centos7-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
+
+- project:
+ name: integration-ietf-actn-tools-linters
+ project: integration/ietf-actn-tools
+ project-name: integration-ietf-actn-tools
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'python':
+ tox-dir: '.'
+ tox-envs: 'py'
+ pattern: '**/*.py'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
+ stream:
+ - 'master':
+ branch: 'master'
+
diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
index 6392bca9e..869d91e1b 100644
--- a/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -23,6 +23,12 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-v1-8c-8g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -DskipTests'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'so/adapters/so-cnf-adapter'
diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index 33a60cba6..cf3a8db58 100644
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -60,3 +60,17 @@
mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: so-adapters-so-etsi-sol003-adapter-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: 'so/adapters/so-etsi-sol003-adapter'
+ project-name: 'so-adapters-so-etsi-sol003-adapter'
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index ebbb698aa..e01c232fa 100644
--- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -23,6 +23,12 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-v1-8c-8g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -DskipTests'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'so/adapters/so-etsi-sol005-adapter'
diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index eb79edfd9..4babd76fd 100644
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -23,6 +23,12 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-v1-8c-8g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -DskipTests'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'so/adapters/so-nssmf-adapter'
diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
index 20c5b9c68..96e495ac5 100644
--- a/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -23,6 +23,12 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-v1-8c-8g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -DskipTests'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'so/adapters/so-oof-adapter'
diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index 2b2c5a093..055e68ed2 100644
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -60,3 +60,17 @@
mvn-settings: 'so-so-admin-cockpit-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: so-so-admin-cockpit-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: 'so/so-admin-cockpit'
+ project-name: 'so-so-admin-cockpit'
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-so-admin-cockpit-settings'
diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index 3a5960930..a8ba50945 100644
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -60,3 +60,17 @@
mvn-settings: 'so-so-etsi-nfvo-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: so-so-etsi-nfvo-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: 'so/so-etsi-nfvo'
+ project-name: 'so-so-etsi-nfvo'
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-so-etsi-nfvo-settings'