Merge "[CDS-MOCK-SSH] Add linters"
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index a0c5cef..43e3161 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -14,7 +14,7 @@
build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean install -P docker -DskipDockerPush=false'
+ mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
new file mode 100644
index 0000000..e260745
--- /dev/null
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
@@ -0,0 +1,41 @@
+---
+- project:
+ name: integration-simulators-nf-simulator-simulator-cli
+ project-name: 'integration-simulators-nf-simulator'
+ python-version: python3
+ tox-dir: '.'
+ tox-envs: ''
+ subproject:
+ - simulator-cli:
+ path: './simulator-cli'
+ pattern: '**'
+ project: 'integration/simulators/nf-simulator'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'integration-simulators-nf-simulator-settings'
+ build-node: ubuntu1804-builder-4c-4g
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-python'
+
+- project:
+ name: integration-simulators-nf-simulator-sonar
+ jobs:
+ - gerrit-tox-sonar
+ cron: '@daily'
+ build-node: ubuntu1804-builder-4c-4g
+ project: 'integration/simulators/nf-simulator'
+ project-name: 'integration-simulators-nf-simulator'
+ branch: 'master'
+ mvn-settings: 'integration-simulators-nf-simulator-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: integration-simulators-nf-simulator-info
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: 'integration/simulators/nf-simulator'
+ project-name: 'integration-simulators-nf-simulator'
+ branch: 'master'
diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index 292224b..2994573 100644
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -14,7 +14,7 @@
build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean install -P docker -DskipDockerPush=false'
+ mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
index 869d91e..e0f1fa1 100644
--- a/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -36,6 +36,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
mvn-settings: 'so-adapters-so-cnf-adapter-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index cf3a8db..86f3f21 100644
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -36,6 +36,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index e01c232..2d1a8d5 100644
--- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -36,6 +36,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index 4babd76..a39a460 100644
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -36,6 +36,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
index 96e495a..2138fcf 100644
--- a/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -36,6 +36,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
mvn-settings: 'so-adapters-so-oof-adapter-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index bd29042..c694f35 100644
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -14,6 +14,9 @@
- 'guilin':
branch: 'guilin'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
functionality:
- 'integration-testing':
trigger_jobs:
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 6355cf0..c7d7bb7 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -19,6 +19,9 @@
- 'guilin':
branch: 'guilin'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
mvn-settings: 'so-libs-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
diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index 295eddd..7e56144 100644
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -36,6 +36,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
mvn-settings: 'so-so-admin-cockpit-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index a8ba509..5a54d93 100644
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -36,6 +36,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'honolulu':
+ branch: 'honolulu'
+ java-version: openjdk11
mvn-settings: 'so-so-etsi-nfvo-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 8be62de..6fae06b 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -32,8 +32,8 @@
- 'guilin':
branch: 'guilin'
java-version: openjdk11
- - 'dynamicBPMN':
- branch: 'Dynamic_BPMN'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-settings: 'so-settings'
files: '**'
@@ -113,3 +113,4 @@
project: so
branch: master
branch: guilin
+ branch: honolulu
diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml
index b68e5fd..c6bc7a3 100644
--- a/jjb/testsuite/testsuite-cds-mock-server.yaml
+++ b/jjb/testsuite/testsuite-cds-mock-server.yaml
@@ -12,3 +12,36 @@
build-node: centos7-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
+
+- project:
+ name: testsuite-cds-mock-server-linters
+ project: 'testsuite/cds-mock-server'
+ project-name: 'testsuite-cds-mock-server'
+ 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/usecase/usecase-ui-nlp.yaml b/jjb/usecase/usecase-ui-nlp.yaml
deleted file mode 100644
index 6528d3b..0000000
--- a/jjb/usecase/usecase-ui-nlp.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: usecase-ui-nlp-project-view
- project-name: usecase-ui-nlp
- views:
- - project-view
-
-- project:
- name: usecase-ui-nlp-info
- project: usecase-ui/nlp
- project-name: usecase-ui-nlp
- build-node: centos7-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
new file mode 100644
index 0000000..bb984ae
--- /dev/null
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -0,0 +1,71 @@
+---
+
+- project:
+ name: usecase-ui-nlp
+ project-name: 'usecase-ui-nlp'
+ project: 'usecase-ui/nlp'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'usecase-ui-nlp-settings'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
+ build-node: ubuntu1804-docker-8c-8g
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+ files: '**'
+ archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: docker
+ build-node: ubuntu1804-builder-4c-4g
+
+- project:
+ name: usecase-ui-nlp-sonar
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
+ cron: '@daily'
+ build-node: ubuntu1804-builder-4c-4g
+ project: 'usecase-ui/nlp'
+ project-name: 'usecase-ui-nlp'
+ branch: 'master'
+ mvn-settings: 'usecase-ui-nlp-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: usecase-ui-nlp-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: usecase-ui/nlp
+ project-name: 'usecase-ui-nlp'
+ build-node: ubuntu1804-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'usecase-ui-nlp-settings'
+
+- project:
+ name: usecase-ui-nlp-info
+ project-name: usecase-ui-nlp
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: usecase-ui/nlp
+ branch: master
+
+- project:
+ name: usecase-ui-nlp-project-view
+ project-name: usecase-ui-nlp
+ views:
+ - project-view
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 932c01f..18017b8 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -67,6 +67,7 @@
- python3.9
- python3.9-dev
- python3.9-tk
+ - python3.9-distutils
become: true
when: ansible_distribution == 'Ubuntu'
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index ca9db41..5d9b7c3 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -121,6 +121,7 @@
- python3.9
- python3.9-dev
- python3.9-tk
+ - python3.9-distutils
become: true
when: ansible_distribution == 'Ubuntu'