Merge "Re-enable Elalto CICD"

diff --git a/global-jjb b/global-jjb
index 7e25ce0..0c2d2ee 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 7e25ce08cc805721308a72aa6f91d29ea31658cc
+Subproject commit 0c2d2eea337b2700a7913d03aa5afd75d0c11b93

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 7872de3..2b0ca12 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -1,6 +1,6 @@
 # Cloud Configuration
 CLOUD_CREDENTIAL_ID=vexx-ecompci
-CLOUD_URL=https://auth.vexxhost.net/v3/
+CLOUD_URL=https://auth.vexxhost.net/v3
 CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index e147067..d69e209 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20200311-205153.422
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20200506-233718.921
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v2-highcpu-2

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index d450c7b..3c83f0a 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -15,6 +15,7 @@ NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
+S3_BUCKET=
 SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-release-2018
 SILO=production

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 412f808..75ce593 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -15,6 +15,7 @@ NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
+S3_BUCKET=
 SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-test
 SILO=sandbox

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 341547a..5e4dab4 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -34,6 +34,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aaf-authz-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml
index 9f3b179..990545b 100644 (file)
--- a/jjb/aaf/aaf-certservice-csit.yaml
+++ b/jjb/aaf/aaf-certservice-csit.yaml
@@ -8,6 +8,8 @@
       stream:
           - "master":
                 branch: "master"
+          -  "frankfurt":
+                branch: "frankfurt"
       functionality:
           - "certservice":
                 trigger_jobs:

diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
index 69a24a8..0fb6892 100644 (file)
--- a/jjb/aaf/aaf-certservice.yaml
+++ b/jjb/aaf/aaf-certservice.yaml
@@ -7,6 +7,9 @@
         -   'master':
                 branch: 'master'
                 java-version: openjdk11
+        -   'frankfurt':
+                branch: 'frankfurt'
+                java-version: openjdk11
     project: 'aaf/certservice'
     mvn-settings: 'aaf-certservice-settings'
     files: '**'

diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index 62ed2fd..5997543 100644 (file)
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -24,6 +24,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aaf-sms-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
index 9b92ea1..4ea6eb8 100644 (file)
--- a/jjb/aai/aai-oom.yaml
+++ b/jjb/aai/aai-oom.yaml
@@ -19,8 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
 
     mvn-settings: 'aai-oom-settings'
     files: '**'

diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 8a3f8e8..26764c6 100644 (file)
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 4fdbb66..edffd6b 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-deployment-settings'
     maven-version: "mvn35"
     files: '**'
@@ -39,6 +41,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-deployment-settings'
     maven-version: "mvn35"
     files: '**'

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 2c226c7..513126b 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -26,6 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-settings'
     maven-version: "mvn35"
     files: '**'

diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index 2ada1b0..c717284 100644 (file)
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -22,6 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-parent-settings'
     maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index be94c4f..47e616b 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -25,6 +25,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-distribution-settings'

diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
deleted file mode 100644 (file)
index 6a943f0..0000000
--- a/jjb/ccsdk/platform-plugins.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-- project:
-    name: ccsdk-platform-plugins
-    project-name: 'ccsdk-platform-plugins'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          sign-artifacts: true
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'ccsdk/platform/plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-platform-plugins-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: ''
-    build-node: centos7-redis-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-- project:
-    name: ccsdk-platform-plugins-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: centos7-redis-4c-4g
-    project: 'ccsdk/platform/plugins'
-    project-name: 'ccsdk-platform-plugins'
-    branch: 'master'
-    mvn-settings: 'ccsdk-platform-plugins-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ccsdk-platform-plugins-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/platform/plugins'
-    project-name: 'ccsdk-platform-plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-platform-plugins-settings'
-    build-node: centos7-redis-4c-4g
-
-
-- project:
-    name: ccsdk-platform-plugins-info
-    project-name: ccsdk-platform-plugins
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/platform/plugins
-    branch: master
-
-- project:
-    name: ccsdk-platform-plugins-whitesource
-    project-name: ccsdk-platform-plugins
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'ccsdk-platform-plugins-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/platform/plugins
-    branch: master

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index b31cffa..8b4d6e5 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -18,6 +18,9 @@
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
     jjb-version: 2.9.1
+    # configure the gerrit-jjb-verify job
+    build-node-label-check: true
+    build-node-label-list: ""
 
 - project:
     name: builder-openstack

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 3813968..24e8d86 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -2,6 +2,7 @@
 - project:
     name: dcaegen2-platform-inventory-api
     project-name: 'dcaegen2-platform-inventory-api'
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -35,6 +36,7 @@
 
 - project:
     name: dcaegen2-platform-inventory-api-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
old mode 100644 (file)
new mode 100755 (executable)
index 2791c37..55c5e90
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,6 +6,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
       - 'frankfurt':
           branch: 'frankfurt'
     # apply to all jobs
@@ -47,6 +48,7 @@
     project: 'dcaegen2/services/pm-mapper'
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -60,6 +62,7 @@
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
 
 - project:

diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index 1305937..318949a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index ea7bcaf..e7bf8fb 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -22,8 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index f03cce0..636c3d2 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -30,6 +30,8 @@
           branch: 'dublin'
       - elalto:
           branch: 'elalto'
+      - frankfurt:
+          branch: 'frankfurt'
 
 - project:
     name: doc-info

diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml
new file mode 100644 (file)
index 0000000..505591c
--- /dev/null
+++ b/jjb/integration/docker/integration-docker-onap-python.yaml
@@ -0,0 +1,63 @@
+---
+- project:
+    name: integration-docker-onap-python-info
+    project-name: integration-docker-onap-python
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/docker/onap-python
+    branch: master
+
+- project:
+      name: integration-docker-onap-python-linters
+      project: integration/docker/onap-python
+      project-name: integration-docker-onap-python
+      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'
+          - 'md':
+              tox-dir: '.'
+              tox-envs: 'md'
+              pattern: '**/*.md'
+      stream:
+          - 'master':
+                branch: 'master'
+
+- project:
+    name: integration-docker-onap-python-release
+    project-name: 'integration-docker-onap-python'
+    project: 'integration/docker/onap-python'
+    mvn-settings: 'integration-settings'
+    jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+- project:
+    name: 'integration-docker-onap-python-docker'
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+    project-name: 'integration-docker-onap-python'
+    project: 'integration/docker/onap-python'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-name: 'onap/integration-python'
+    docker-build-args: '-f ./Dockerfile'
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'integration-settings'
+    build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index c39ca2a..b315bc4 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -17,16 +17,11 @@
           pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml'
           pattern: 'test/mocks/mass-pnf-sim/**'
           mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
-          PNF_INSTANCES: 1
           post-docker-verify-script: |
               #!/bin/bash
               set -ex # Fail build if any setup step fails
               cd $WORKSPACE/test/mocks/mass-pnf-sim
-              ./mass-pnf-sim.py --bootstrap {PNF_INSTANCES} --urlves http://127.0.0.1:10000/eventListener/v7 --ipfileserver 127.0.0.1 --typefileserver sftp --ipstart 10.11.0.16
-              ./mass-pnf-sim.py --start {PNF_INSTANCES}
-              ./mass-pnf-sim.py --trigger {PNF_INSTANCES}
-              ./mass-pnf-sim.py --stop {PNF_INSTANCES}
-              ./mass-pnf-sim.py --clean
+              tox
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 9964750..11680b6 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -64,6 +64,7 @@
           sudo apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant
           vagrant plugin install vagrant-libvirt
           vagrant plugin install vagrant-disksize
+          vagrant plugin install vagrant-sshfs
           mkdir -p ~/.ssh
 
 - builder:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 61d09d7..622d523 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -44,7 +44,7 @@
     publishers:
       - lf-infra-publish
 
-- job-template:
+- job-template: &tox_verify_boilerplate
     # Job template for running linters against specific file formats
     #
     # Required Variables:
@@ -98,3 +98,9 @@
 
     publishers:
       - lf-infra-publish
+
+- job-template:
+    <<: *tox_verify_boilerplate
+    name: '{project-name}-{stream}-{subproject}-tox-verify'
+    id: integration-tox-verify
+    description: 'Job intended for running tox'

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index d24b9df..481aca9 100644 (file)
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -29,7 +29,7 @@
                 build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+                mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
 
 - project:
       name: integration-simulators-pnf-simulator-sonar
@@ -60,6 +60,22 @@
       project: integration/simulators/pnf-simulator
       branch: master
 
+- project:
+      name: integration-simulators-pnf-simulator-cli
+      project: integration/simulators/pnf-simulator
+      project-name: integration-pnf-simulator
+      python-version: python3
+      jobs:
+          - integration-tox-verify
+      subproject:
+          - 'simulator-cli':
+                tox-dir: 'simulator-cli'
+                tox-envs: 'pytest'
+                pattern: '**/*'
+      stream:
+          - 'master':
+                branch: 'master'
+
 - project:
       name: integration-simulators-pnf-simulator-linters
       project: integration/simulators/pnf-simulator

diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
new file mode 100644 (file)
index 0000000..2065813
--- /dev/null
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -0,0 +1,128 @@
+---
+- project:
+    name: integration-xtesting-info
+    project-name: integration-xtesting
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/xtesting
+    branch: master
+
+- project:
+      name: integration-xtesting-linters
+      project: integration/xtesting
+      project-name: integration-xtesting
+      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'
+          - 'md':
+              tox-dir: '.'
+              tox-envs: 'md'
+              pattern: '**/*.md'
+      stream:
+          - 'master':
+                branch: 'master'
+
+- project:
+    name: integration-xtesting-release
+    project-name: 'integration-xtesting'
+    project: 'integration/docker/onap-python'
+    mvn-settings: 'integration-settings'
+    jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+- project:
+    name: 'integration-xtesting-docker'
+    jobs:
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-infra-healthcheck'
+          docker-root: ./infra-healthcheck
+          docker-name: 'onap/xtesting-infra-healthcheck'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-infra-healthcheck'
+          docker-root: ./infra-healthcheck
+          docker-name: 'onap/xtesting-infra-healthcheck'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-healthcheck'
+          docker-root: ./healthcheck
+          docker-name: 'onap/xtesting-healthcheck'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-healthcheck'
+          docker-root: ./healthcheck
+          docker-name: 'onap/xtesting-healthcheck'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+          docker-root: ./smoke-usecases-pythonsdk
+          docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+          docker-root: ./smoke-usecases-pythonsdk
+          docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-smoke-usecases-robot'
+          docker-root: ./smoke-usecases-robot
+          docker-name: 'onap/xtesting-smoke-usecases-robot'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-smoke-usecases-robot'
+          docker-root: ./smoke-usecases-robot
+          docker-name: 'onap/xtesting-smoke-usecases-robot'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-benchmarking'
+          docker-root: ./benchmarking
+          docker-name: 'onap/xtesting-benchmarking'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-benchmarking'
+          docker-root: ./benchmarking
+          docker-name: 'onap/xtesting-benchmarking'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-candidate-usecases'
+          docker-root: ./candidate-usecases
+          docker-name: 'onap/xtesting-candidate-usecases'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-candidate-usecases'
+          docker-root: ./candidate-usecases
+          docker-name: 'onap/xtesting-candidate-usecases'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-security'
+          docker-root: ./security
+          docker-name: 'onap/xtesting-security'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-security'
+          docker-root: ./security
+          docker-name: 'onap/xtesting-security'
+          docker-build-args: '-f ./docker/Dockerfile'
+    project: 'integration/xtesting'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'integration-settings'
+    build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/integration/xtesting/info-integration-xtesting.yaml b/jjb/lf-infra-sandbox-3.yaml
similarity index 51%
rename from jjb/integration/xtesting/info-integration-xtesting.yaml
rename to jjb/lf-infra-sandbox-3.yaml
index babd9f6..6f496d5 100644 (file)
--- a/jjb/integration/xtesting/info-integration-xtesting.yaml
+++ b/jjb/lf-infra-sandbox-3.yaml
@@ -1,9 +1,9 @@
 ---
 - project:
-    name: integration-xtesting-info
-    project-name: integration-xtesting
+    name: sandbox-3
+    project-name: sandbox-3
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
-    project: integration/xtesting
+    project: sandbox-3
     branch: master

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
deleted file mode 100644 (file)
index 085788f..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-aai-context-builder
-    project-name: logging-analytics-pomba-pomba-aai-context-builder
-    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
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-aai-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-
-    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-#- project:
-#    name: logging-analytics-pomba-pomba-arm64-aai-context-builder
-#    project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: logging-analytics/pomba/pomba-aai-context-builder
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#
-#    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
-- project:
-    name: logging-analytics-pomba-pomba-aai-context-builder-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: logging-analytics/pomba/pomba-aai-context-builder
-    project-name: logging-analytics-pomba-pomba-aai-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-aai-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-aai-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-aai-context-builder'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-aai-context-builder-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-aai-context-builder
-    project-name: logging-analytics-pomba-pomba-aai-context-builder
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
deleted file mode 100644 (file)
index 0130f17..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-audit-common
-    project-name: logging-analytics-pomba-pomba-audit-common
-    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}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-audit-common
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: logging-analytics-pomba-pomba-audit-common-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: logging-analytics/pomba/pomba-audit-common
-    project-name: logging-analytics-pomba-pomba-audit-common
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: logging-analytics-pomba-pomba-audit-common-info
-    project-name: 'logging-analytics-pomba-pomba-audit-common'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-audit-common'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-audit-common-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-audit-common
-    project-name: logging-analytics-pomba-pomba-audit-common
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-audit-common-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
deleted file mode 100644 (file)
index 0fed024..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-context-aggregator
-    project-name: logging-analytics-pomba-pomba-context-aggregator
-    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
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-context-aggregator
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-context-aggregator-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: logging-analytics/pomba/pomba-context-aggregator
-    project-name: logging-analytics-pomba-pomba-context-aggregator
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-context-aggregator-info
-    project-name: 'logging-analytics-pomba-pomba-context-aggregator'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-context-aggregator'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-context-aggregator-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-context-aggregator
-    project-name: logging-analytics-pomba-pomba-context-aggregator
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
deleted file mode 100644 (file)
index bc760c0..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-network-discovery-context-builder
-    project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
-    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
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-network-discovery-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-#- project:
-#    name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
-#    project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: logging-analytics/pomba/pomba-network-discovery-context-builder
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#      - 'casablanca':
-#          branch: 'casablanca'
-#    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
-- project:
-    name: logging-analytics-pomba-pomba-network-discovery-context-builder-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: logging-analytics/pomba/pomba-network-discovery-context-builder
-    project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-network-discovery-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-network-discovery-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-network-discovery-context-builder'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-network-discovery-context-builder-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-network-discovery-context-builder
-    project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
deleted file mode 100644 (file)
index 17c4198..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-sdc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdc-context-builder
-    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
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-sdc-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-#- project:
-#    name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
-#    project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: logging-analytics/pomba/pomba-sdc-context-builder
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
-- project:
-    name: logging-analytics-pomba-pomba-sdc-context-builder-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: logging-analytics/pomba/pomba-sdc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdc-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdc-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-sdc-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-sdc-context-builder'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdc-context-builder-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-sdc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdc-context-builder
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
deleted file mode 100644 (file)
index 4b94f80..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
-    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
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-#- project:
-#    name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
-#    project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: logging-analytics/pomba/pomba-sdnc-context-builder
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder-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: 'H 11 * * *'
-    build-node: ubuntu1804-builder-4c-4g
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-sdnc-context-builder'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings

diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index fb7bdd8..0d15236 100644 (file)
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -27,8 +27,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 5868f9f..4b0803c 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -35,6 +35,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'dublin':
           branch: 'dublin'
       - 'casablanca':

diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml
new file mode 100644 (file)
index 0000000..b43b4a0
--- /dev/null
+++ b/jjb/oom/oom-readiness.yaml
@@ -0,0 +1,61 @@
+---
+- project:
+    name: oom-readiness-info
+    project-name: oom-readiness
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: oom/readiness
+    branch: master
+
+- project:
+      name: oom-readiness-linters
+      project: oom/readiness
+      project-name: oom-readiness
+      python-version: python3
+      jobs:
+          - oom-linters
+      subproject:
+          - 'yaml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yaml'
+          - 'yml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yml'
+          - 'py':
+                tox-dir: '.'
+                tox-envs: 'python'
+                pattern: '**/*.python'
+      stream:
+          - 'master':
+                branch: 'master'
+          - 'frankfurt':
+                branch: 'frankfurt'
+
+- project:
+    name: oom-readiness-release
+    project-name: oom-readiness
+    project: oom/readiness
+    mvn-settings: 'oom-settings'
+    jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+- project:
+    name: 'oom-readiness-docker'
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+    project-name: 'oom-readiness'
+    project: 'oom/readiness'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-name: 'onap/oom/readiness'
+    docker-build-args: '-f ./Dockerfile'
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'oom-settings'
+    build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/oom/oom-templates.yaml b/jjb/oom/oom-templates.yaml
new file mode 100644 (file)
index 0000000..3134bef
--- /dev/null
+++ b/jjb/oom/oom-templates.yaml
@@ -0,0 +1,55 @@
+---
+- job-template:
+    # Job template for running linters against specific file formats
+    #
+    # Required Variables:
+    #     python-version: Python version to deploy in venv
+    #     tox-env:        Tox environments to run
+    #     tox-dir:        Directory containing the project's tox.ini
+    #     pattern:        List of file patterns to scan
+
+    name: '{project-name}-{stream}-{subproject}-lint'
+    id: oom-linters
+    project-type: freestyle
+    description: 'Job intended for running linters with Tox and Coala'
+    build-node: ubuntu1804-builder-4c-4g
+    node: '{build-node}'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - lf-infra-tox-parameters:
+          tox-dir: '{tox-dir}'
+          tox-envs: '{tox-envs}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - lf-infra-tox-install:
+          python-version: '{python-version}'
+      - lf-infra-tox-run:
+          parallel: 'false'
+
+    publishers:
+      - lf-infra-publish

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 2c0d585..88c2384 100644 (file)
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -31,8 +31,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'optf-cmso-settings'
     java-version: openjdk11
 
@@ -74,8 +74,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'optf-cmso-settings'
     java-version: openjdk11
 

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index c657540..516ec84 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
@@ -66,8 +66,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'optf-has-settings'
 
 - project:

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 2607b1f..c5a91f2 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -7,8 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
@@ -67,8 +67,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'optf-osdf-settings'
 
 - project:

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 34a7a64..1aaec94 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -31,12 +31,44 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-apex-pdp-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-apex-pdp-jdk8
+    project-name: 'policy-apex-pdp'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/apex-pdp'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-apex-pdp-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: policy-apex-pdp-sonar
     jobs:

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 4c4c47d..4d251a2 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -25,12 +25,44 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-api-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-api-jdk8
+    project-name: 'policy-api'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/api'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-api-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-api-sonar
     jobs:

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 006ad3b..e3e0ce8 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-common-settings'
     java-version: openjdk11
     files: '**'

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 38759ff..16025c0 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -9,6 +9,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'apex-pdp'
     trigger_jobs:
@@ -26,6 +28,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'distribution'
     trigger_jobs:
@@ -42,6 +46,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'api'
     trigger_jobs:
@@ -59,6 +65,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'xacml-pdp'
     trigger_jobs:
@@ -76,6 +84,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'pap'
     trigger_jobs:
@@ -92,6 +102,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'drools-pdp'
     trigger_jobs:
@@ -108,6 +120,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'drools-applications'
     trigger_jobs:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 9cb4ca0..87d18ca 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -25,12 +25,44 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-distribution-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-distribution-jdk8
+    project-name: 'policy-distribution'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/distribution'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-distribution-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-distribution-sonar
     jobs:

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 61ac6fe..96e9c17 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-docker-base-common-elalto
+    name: policy-docker-base-common
     project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -20,15 +20,15 @@
 
     project: 'policy/docker'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: policy-docker-base-common
+    name: policy-docker-base-common-frankfurt
     project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -77,8 +77,8 @@
 
     project: 'policy/docker'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index d255266..d122a50 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -25,12 +25,45 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
 
+
+- project:
+    name: policy-drools-applications-jdk8
+    project-name: 'policy-drools-applications'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/drools-applications'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-drools-applications-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: policy-drools-applications-sonar
     jobs:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 6440e35..23b00cc 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -25,12 +25,44 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-drools-pdp-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-drools-pdp-jdk8
+    project-name: 'policy-drools-pdp'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/drools-pdp'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-drools-pdp-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: policy-drools-pdp-sonar
     jobs:

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 9f8030a..cb9e82f 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -23,14 +23,45 @@
 
     project: 'policy/engine'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-engine-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
 
+- project:
+    name: policy-engine-jdk8
+    project-name: 'policy-engine'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/engine'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-engine-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+
 - project:
     name: policy-engine-sonar
     jobs:
@@ -44,7 +75,7 @@
     build-node: ubuntu1804-builder-4c-4g
     project: 'policy/engine'
     project-name: 'policy-engine'
-    branch: 'master'
+    branch: 'frankfurt'
     mvn-settings: 'policy-engine-settings'
     java-version: openjdk11
     mvn-goals: 'clean install'
@@ -58,7 +89,7 @@
     nexus-iq-namespace: 'onap-'
     project: policy/engine
     project-name: 'policy-engine'
-    branch: 'master'
+    branch: 'frankfurt'
     mvn-settings: 'policy-engine-settings'
     java-version: openjdk11
     build-node: 'ubuntu1804-builder-4c-4g'
@@ -70,4 +101,4 @@
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: policy/engine
-    branch: master
+    branch: frankfurt

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 0b9e637..a3a7b31 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-models-settings'
     java-version: openjdk11
     files: '**'

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 75c9e22..049e0ae 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -25,12 +25,44 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-pap-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-pap-jdk8
+    project-name: 'policy-pap'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/pap'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-pap-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-pap-sonar
     jobs:

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 7901d4f..8d803fa 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-parent-settings'
     java-version: openjdk11
     files: '**'

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index a4982aa..144eba1 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -25,12 +25,44 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-xacml-pdp-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-xacml-pdp-jdk8
+    project-name: 'policy-xacml-pdp'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/xacml-pdp'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-xacml-pdp-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-xacml-pdp-sonar
     jobs:

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 8cba7aa..428251a 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -26,6 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'sdnc-oam-settings'

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 2de4db9..f408d95 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -32,7 +32,7 @@
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-sonar
@@ -45,7 +45,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -58,7 +58,7 @@
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu1804-builder-4c-4g'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -88,7 +88,7 @@
     nexus-iq-namespace: 'onap-'
     project: so
     project-name: 'so'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'

diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
new file mode 100644 (file)
index 0000000..b1b3f54
--- /dev/null
+++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
@@ -0,0 +1,45 @@
+---
+- project:
+    name: testsuite-pythonsdk-tests-info
+    project-name: testsuite-pythonsdk-tests
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: testsuite/pythonsdk-tests
+    branch: master
+
+- project:
+    name: testsuite-pythonsdk-tests-linters
+    project: 'testsuite/pythonsdk-tests'
+    project-name: 'testsuite-pythonsdk-tests'
+    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'
+      - 'rst':
+          tox-dir: '.'
+          tox-envs: 'rst'
+          pattern: '**/*.rst'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'

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

diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml
deleted file mode 100644 (file)
index e4e112f..0000000
--- a/jjb/usecases/5G-bulkpm.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-    name: usecases-5G-bulkpm-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecases'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com rajendra.jaiswal@ericsson.com liam.burke@ericsson.com'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - '5G-bulkpm':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''

diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml
index 69e92f8..8e70983 100644 (file)
--- a/jjb/usecases/usecases-csit.yaml
+++ b/jjb/usecases/usecases-csit.yaml
@@ -1,19 +1,49 @@
 ---
 - project:
-    name: usecases-csit
+    name: usecases-5G-bulkpm-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecases'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech eric.e.moore@est.tech raj.gumma@ericsson.com'
+    project-name: 'usecases-5G-bulkpm'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com lego@est.tech'
     stream:
       - 'master':
           branch: 'master'
     functionality:
-      - 'config-over-netconf':
+      - '5G-bulkpm':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+
+- project:
+    name: usecases-pnf-sw-upgrade
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'usecases-pnf-sw-upgrade'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
       - 'pnf-sw-upgrade':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
+
+- project:
+    name: usecases-config-over-netconf
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'usecases-config-over-netconf'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'config-over-netconf':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+

diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
deleted file mode 100644 (file)
index cb43838..0000000
--- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: vfc-nfvo-catalog-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-catalog'
-    recipients: 'yangyanyj@chinamobile.com'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index daed681..daecffe 100644 (file)
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -6,8 +6,8 @@
   become_method: sudo
 
   vars:
-    kubectl_version: 1.11.2
-    helm_version: 2.12.3
+    kubectl_version: 1.15.11
+    helm_version: 2.16.6
 
   tasks:
     - name: 'Install kubectl {{kubectl_version}}'
@@ -36,4 +36,3 @@
           command: 'which helm'
         - name: 'Check kubectl.'
           command: 'which kubectl'
-