Merge "Refactor verification job templates"

diff --git a/global-jjb b/global-jjb
index 4b1496d..43e8d01 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 4b1496d42d0b44c650fc700234d30ae35dc4176d
+Subproject commit 43e8d01716072314eb7d90cb1da1db4b431bb6cd

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index a8d9328..7b095be 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200720-175313.316
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210129-195204.476
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
index dc4d62f..9f24c4b 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210129-195200.311
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
 VOLUME_SIZE=20

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 9dd6e54..2750c3c 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -77,3 +77,17 @@
     mvn-settings: 'cps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: cps-whitesource
+    project-name: cps
+    jobs:
+      - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'cps-settings'
+    wss-product-name: cps
+    mvn-clean-install: true
+    project: cps
+    branch: master
+

diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
new file mode 100644 (file)
index 0000000..8c77db7
--- /dev/null
+++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
@@ -0,0 +1,34 @@
+---
+- project:
+    name: integration-simulators-core-nssmf-simulator-info
+    project: integration/simulators/core-nssmf-simulator
+    project-name: integration-simulators-core-nssmf-simulator
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-simulators-core-nssmf-simulator
+    project: integration/simulators/core-nssmf-simulator
+    project-name: integration-simulators-core-nssmf-simulator
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'integration-simulators-core-nssmf-simulator-settings'
+    files: '**'
+    maven-deploy-properties: |
+        deployAtEnd=true
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+        - '{project-name}-{stream}-verify-java':
+            mvn-goals: 'clean install'
+        - '{project-name}-{stream}-merge-java':
+            mvn-goals: 'clean deploy'
+        -  '{project-name}-gerrit-release-jobs':
+            build-node: centos7-docker-8c-8g
+        - gerrit-maven-stage:
+            sign-artifacts: true
+            build-node: centos7-docker-8c-8g
+            maven-versions-plugin: true
+            mvn-goals: 'clean deploy'

diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index a4d46a5..0c54744 100644 (file)
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -24,8 +24,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-3.3.0':
-          branch: 'release-3.3.0'
+      - 'release-3.4.0':
+          branch: 'release-3.4.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
new file mode 100644 (file)
index 0000000..eac74c8
--- /dev/null
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: so-adapters-so-cnf-adapter-project-view
+    project-name: so-adapters-so-cnf-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-cnf-adapter-info
+    project: so/adapters/so-cnf-adapter
+    project-name: so-adapters-so-cnf-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
new file mode 100644 (file)
index 0000000..aee64de
--- /dev/null
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: so-adapters-so-etsi-sol003-adapter-project-view
+    project-name: so-adapters-so-etsi-sol003-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-etsi-sol003-adapter-info
+    project: so/adapters/so-etsi-sol003-adapter
+    project-name: so-adapters-so-etsi-sol003-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
new file mode 100644 (file)
index 0000000..68e6b26
--- /dev/null
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: so-adapters-so-etsi-sol005-adapter-project-view
+    project-name: so-adapters-so-etsi-sol005-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-etsi-sol005-adapter-info
+    project: so/adapters/so-etsi-sol005-adapter
+    project-name: so-adapters-so-etsi-sol005-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
new file mode 100644 (file)
index 0000000..b82553b
--- /dev/null
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: so-adapters-so-nssmf-adapter-project-view
+    project-name: so-adapters-so-nssmf-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-nssmf-adapter-info
+    project: so/adapters/so-nssmf-adapter
+    project-name: so-adapters-so-nssmf-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
new file mode 100644 (file)
index 0000000..2f61ab7
--- /dev/null
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: so-adapters-so-oof-adapter-project-view
+    project-name: so-adapters-so-oof-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-oof-adapter-info
+    project: so/adapters/so-oof-adapter
+    project-name: so-adapters-so-oof-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
new file mode 100644 (file)
index 0000000..ad0325b
--- /dev/null
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: so-so-admin-cockpit-project-view
+    project-name: so-so-admin-cockpit
+    views:
+      - project-view
+
+- project:
+    name: so-so-admin-cockpit-info
+    project: so/so-admin-cockpit
+    project-name: so-so-admin-cockpit
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
new file mode 100644 (file)
index 0000000..27debb7
--- /dev/null
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: so-so-etsi-nfvo-project-view
+    project-name: so-so-etsi-nfvo
+    views:
+      - project-view
+
+- project:
+    name: so-so-etsi-nfvo-info
+    project: so/so-etsi-nfvo
+    project-name: so-so-etsi-nfvo
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/packer/common-packer b/packer/common-packer
index cc24d06..38f8109 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit cc24d06cb483bfa17184f4fb55d6889c54e1b494
+Subproject commit 38f810974c2fdb9b4eb998b5efee93362904cced